fix http response

custom_components/mega/__init__.py

@@ -24,7 +24,7 @@ from .http import MegaView
 
 _LOGGER = logging.getLogger(__name__)
 
-CUSTOMIZE_PORT = vol.Schema({
+CUSTOMIZE_PORT = {
     vol.Optional(CONF_SKIP, description='исключить порт из сканирования', default=False): bool,
     vol.Optional(CONF_INVERT, default=False): bool,
     vol.Optional(CONF_NAME): vol.Any(str, {
@@ -42,16 +42,15 @@ CUSTOMIZE_PORT = vol.Schema({
     vol.Optional(CONF_ACTION): cv.script_action, # пока не реализовано
     vol.Optional(CONF_GET_VALUE, default=True): bool,
     vol.Optional(CONF_CONV_TEMPLATE): cv.template
-})
-CUSTOMIZE_DS2413 = vol.Schema({
+}
+CUSTOMIZE_DS2413 = {
     vol.Optional(str.lower, description='адрес и индекс устройства'): CUSTOMIZE_PORT
-})
+}
 
 CONFIG_SCHEMA = vol.Schema(
     {
         DOMAIN: {
             vol.Optional(CONF_ALLOW_HOSTS): [str],
-            # vol.Optional(CONF_FORCE_D, description='Принудительно слать d после срабатывания входа', default=False): bool,
             vol.Required(str, description='id меги из веб-интерфейса'): {
                 vol.Optional(CONF_FORCE_D, description='Принудительно слать d после срабатывания входа', default=False): bool,
                 vol.Optional(int, description='номер порта'): vol.Any(

custom_components/mega/entities.py

@@ -48,6 +48,9 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
             index=None,
     ):
         super().__init__(mega.updater)
+
+        self.http_cmd = http_cmd
+
         self._state: State = None
         self.port = port
         self.config_entry = config_entry
@@ -60,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):
@@ -125,7 +129,8 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
             _task_set_ev_on = asyncio.create_task(_set_events_on())
 
     async def get_state(self):
-        if self.mega.mqtt is None:
+        self.lg.debug(f'state is %s', self.state)
+        if not self.mega.mqtt_inputs:
             self.async_write_ha_state()
 
 
@@ -248,21 +253,25 @@ class MegaOutPort(MegaPushEntity):
             return self._state == 'ON'
         elif val is not None:
             val = val.get("value")
-            if self.index and self.addr:
-                _val = val.get(self.addr)
-                if not isinstance(val, str):
-                    self.mega.lg.warning(f'{self} has wrong state: {val}')
+            if self.index is not None and self.addr is not None:
+                if not isinstance(val, dict):
+                    self.mega.lg.warning(f'{self.entity_id}: {val} is not a dict')
+                    return
+                _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} 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:
-                self.mega.lg.warning(f'{self} does not has addr')
+            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:
@@ -284,10 +293,10 @@ class MegaOutPort(MegaPushEntity):
             cmd = brightness
         else:
             cmd = 1 if not self.invert else 0
-        cmd = {"cmd": f"{self.cmd_port}:{cmd}"}
+        _cmd = {"cmd": f"{self.cmd_port}:{cmd}"}
         if self.addr:
-            cmd['addr'] = self.addr
-        await self.mega.request(**cmd)
+            _cmd['addr'] = self.addr
+        await self.mega.request(**_cmd)
         if self.index is not None:
             # обновление текущего стейта для ds2413
             await self.mega.get_port(
@@ -303,10 +312,10 @@ class MegaOutPort(MegaPushEntity):
     async def async_turn_off(self, **kwargs) -> None:
 
         cmd = "0" if not self.invert else "1"
-        cmd = {"cmd": f"{self.cmd_port}:{cmd}"}
+        _cmd = {"cmd": f"{self.cmd_port}:{cmd}"}
         if self.addr:
-            cmd['addr'] = self.addr
-        await self.mega.request(**cmd)
+            _cmd['addr'] = self.addr
+        await self.mega.request(**_cmd)
         if self.index is not None:
             # обновление текущего стейта для ds2413
             await self.mega.get_port(

custom_components/mega/http.py

@@ -78,7 +78,8 @@ 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'})
+        await hub.request(cmd=ret)
         return ret
 
     async def later_update(self, hub):

custom_components/mega/hub.py

@@ -101,6 +101,7 @@ class MegaD:
         self.cnd = asyncio.Condition()
         self.online = True
         self.entities: typing.List[BaseMegaEntity] = []
+        self.ds2413_ports = set()
         self.poll_interval = scan_interval
         self.subs = None
         self.lg: logging.Logger = lg.getChild(self.id)
@@ -191,25 +192,25 @@ class MegaD:
             )
             self.online = True
 
+    async def _get_ds2413(self):
+        """
+        обновление ds2413 устройств
+        :return:
+        """
+        for x in self.ds2413_ports:
+            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):
         """
         Polling ports
         """
         self.lg.debug('poll')
-        ds2413_polled = []
-        for x in self.entities:
-            # обновление ds2413 устройств
-            if x.http_cmd == 'ds2413':
-                self.lg.debug(f'poll ds2413 for {x.entity_id}')
-                if x.port in ds2413_polled:
-                    continue
-                await self.get_port(
-                    port=x.port,
-                    force_http=True,
-                    http_cmd='list',
-                    conv=False
-                )
-                ds2413_polled.append(x.port)
         if self.mqtt is None:
             await self.get_all_ports()
             await self.get_sensors(only_list=True)
@@ -219,6 +220,7 @@ class MegaD:
             await self.get_sensors()
         else:
             await self.get_port(self.port_to_scan)
+        await self._get_ds2413()
         return self.values
 
     async def get_mqtt_id(self):
@@ -313,6 +315,8 @@ class MegaD:
         if not self.mqtt_inputs:
             ret = await self.request(cmd='all')
             for port, x in enumerate(ret.split(';')):
+                if port in self.ds2413_ports:
+                    continue
                 if check_skip and not port in self.ports:
                     continue
                 ret = self.parse_response(x)
@@ -460,7 +464,7 @@ class MegaD:
                     self.lg.warning(f'can not add ds2413 on port {port}, it has wrong data: {_data}')
                     continue
                 for addr, state in data.items():
-                    ret['light'][port].append([
+                    ret['light'][port].extend([
                         {"index": 0, "addr": addr, "id_suffix": f'{addr}_a', "http_cmd": 'ds2413'},
                         {"index": 1, "addr": addr, "id_suffix": f'{addr}_b', "http_cmd": 'ds2413'},
                     ])

custom_components/mega/manifest.json

@@ -15,5 +15,5 @@
     "@andvikt"
   ],
   "issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
-  "version": "v0.4.1b3"
+  "version": "v0.4.1b7"
 }