add timeouts

.experiment.py

@@ -1,5 +1,15 @@
-from itertools import permutations
+order ='brg'
+rgb = 'rgb'
 
-RGB_COMBINATIONS = [''.join(x) for x in permutations('rgb')]
+map_to_order = [rgb.index(x) for x in order]
+map_from_order = [order.index(x) for x in rgb]
 
-print(RGB_COMBINATIONS)
+
+_rgb = [
+        rgb[x] for x in map_to_order
+    ]
+_order = [
+        _rgb[x] for x in map_from_order
+    ]
+
+print(_rgb, _order)

custom_components/mega/const.py

@@ -77,4 +77,5 @@ REMOVE_CONFIG = [
     'sensor',
     'smooth',
 ]
-RGB_COMBINATIONS = [''.join(x) for x in permutations('rgb')]
+RGB_COMBINATIONS = [''.join(x) for x in permutations('rgb')]
+RGB = 'rgb'

custom_components/mega/hub.py

@@ -157,11 +157,10 @@ class MegaD:
         if force_d is not None:
             self.customize[CONF_FORCE_D] = force_d
         try:
-            if allow_hosts is not None:
+            if allow_hosts is not None and DOMAIN in hass.data:
                 allow_hosts = set(allow_hosts.split(';'))
                 hass.data[DOMAIN][CONF_HTTP].allowed_hosts |= allow_hosts
             hass.data[DOMAIN][CONF_HTTP].protected = protected
-
         except Exception:
             self.lg.exception('while setting allowed hosts')
 
@@ -186,7 +185,10 @@ class MegaD:
                 continue
             if x.port in ports:
                 continue
-            await self.get_port(x.port, force_http=True, http_cmd=x.http_cmd)
+            try:
+                await self.get_port(x.port, force_http=True, http_cmd=x.http_cmd)
+            except asyncio.TimeoutError:
+                continue
             ports.append(x.port)
 
     @property
@@ -233,12 +235,15 @@ class MegaD:
         """
         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
-            )
+            try:
+                await self.get_port(
+                    port=x,
+                    force_http=True,
+                    http_cmd='list',
+                    conv=False
+                )
+            except asyncio.TimeoutError:
+                continue
 
     async def poll(self):
         """
@@ -253,6 +258,7 @@ class MegaD:
             ret = await self._update_i2c(x)
             if isinstance(ret, dict):
                 self.values.update(ret)
+
         for x in self.extenders:
             ret = await self._update_extender(x)
             if not isinstance(ret, dict):
@@ -290,14 +296,21 @@ class MegaD:
             url = f"{url}/?{cmd}"
         self.lg.debug('request: %s', url)
         async with self._http_lck(priority):
-            async with aiohttp.request("get", url=url) as req:
-                if req.status != 200:
-                    self.lg.warning('%s returned %s (%s)', url, req.status, await req.text())
-                    return None
-                else:
-                    ret = await req.text()
-                    self.lg.debug('response %s', ret)
-                    return ret
+            for _ntry in range(3):
+                try:
+                    async with aiohttp.request("get", url=url, timeout=aiohttp.ClientTimeout(total=5)) as req:
+                        if req.status != 200:
+                            self.lg.warning('%s returned %s (%s)', url, req.status, await req.text())
+                            return None
+                        else:
+                            ret = await req.text()
+                            self.lg.debug('response %s', ret)
+                            return ret
+                except asyncio.TimeoutError:
+                    self.lg.warning(f'timeout while requesting {url}')
+                    raise
+                    # await asyncio.sleep(1)
+            raise asyncio.TimeoutError('after 3 tries')
 
     async def save(self):
         await self.send_command(cmd='s')
@@ -350,7 +363,10 @@ class MegaD:
         return {e.port for e in self.entities}
 
     async def get_all_ports(self, only_out=False, check_skip=False):
-        ret = await self.request(cmd='all')
+        try:
+            ret = await self.request(cmd='all')
+        except asyncio.TimeoutError:
+            return
         for port, x in enumerate(ret.split(';')):
             if port in self.ds2413_ports:
                 continue
@@ -446,7 +462,10 @@ class MegaD:
         :param port:
         :return:
         """
-        values = await self.request(pt=port, cmd='get')
+        try:
+            values = await self.request(pt=port, cmd='get')
+        except asyncio.TimeoutError:
+            return
         ret = {}
         for i, x in enumerate(values.split(';')):
             ret[f'{port}e{i}'] = x
@@ -462,9 +481,12 @@ class MegaD:
         delay = None
         if 'delay' in params:
             delay = params.pop('delay')
-        ret = {
-            _params: await self.request(**params)
-        }
+        try:
+            ret = {
+                _params: await self.request(**params)
+            }
+        except asyncio.TimeoutError:
+            return
         self.lg.debug('i2c response: %s', ret)
         if delay:
             self.lg.debug('delay %s', delay)
@@ -673,7 +695,7 @@ class MegaD:
                 cmd = dict(
                     pt=config[0][0],
                     chip=chip,
-                    ws=''.join([hex(x).split('x')[1].ljust(2, '0').upper() for x in _next_val])
+                    ws=''.join([hex(x).split('x')[1].rjust(2, '0').upper() for x in _next_val])
                 )
                 await self.request(**cmd)
 

custom_components/mega/light.py

@@ -33,9 +33,9 @@ from .const import (
     CONF_SWITCH,
     DOMAIN,
     CONF_CUSTOM,
-    CONF_SKIP, CONF_LED, CONF_WS28XX, CONF_PORTS, CONF_WHITE_SEP, CONF_SMOOTH, CONF_ORDER, CONF_CHIP,
+    CONF_SKIP, CONF_LED, CONF_WS28XX, CONF_PORTS, CONF_WHITE_SEP, CONF_SMOOTH, CONF_ORDER, CONF_CHIP, RGB,
 )
-from .tools import int_ignore
+from .tools import int_ignore, map_reorder_rgb
 
 lg = logging.getLogger(__name__)
 SCAN_INTERVAL = timedelta(seconds=5)
@@ -119,14 +119,8 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
         self._task: asyncio.Task = None
         self._restore = None
         self.smooth: timedelta = self.customize[CONF_SMOOTH]
-        self._color_map = self.customize.get(CONF_ORDER, 'rgb')
+        self._color_order = self.customize.get(CONF_ORDER, 'rgb')
         self._last_called: float = 0
-        if self._color_map == 'rgb':
-            self._color_map = None
-        else:
-            self._color_map = {
-                x: i for i, x in enumerate(self._color_map)
-            }
         self._max_values = None
 
     @property
@@ -189,11 +183,9 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
         rgb = [
             round(x * self.max_values[i]) for i, x in enumerate(rgb)
         ]
-        if self.is_ws and self._color_map is not None:
+        if self.is_ws:
             # восстанавливаем мэпинг
-            rgb = [
-                rgb[self._color_map[x]] for x in 'rgb'
-            ]
+            rgb = map_reorder_rgb(rgb, RGB, self._color_order)
         return rgb
 
     async def async_turn_on(self, **kwargs):
@@ -267,7 +259,10 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
         else:
             w = None
             rgb = rgbw
-
+        if self.is_ws:
+            rgb = map_reorder_rgb(
+                rgb, self._color_order, RGB
+            )
         h, s, v = colorsys.rgb_to_hsv(*[x/self.max_values[i] for i, x in enumerate(rgb)])
         h *= 360
         s *= 100

custom_components/mega/manifest.json

@@ -15,5 +15,5 @@
     "@andvikt"
   ],
   "issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
-  "version": "v1.0.0b1"
+  "version": "v1.0.1"
 }

custom_components/mega/sensor.py

@@ -146,7 +146,7 @@ class MegaI2C(MegaPushEntity):
                 ret = tmpl.async_render({'value': ret})
         except:
             ret = ret
-        return ret
+        return str(ret)
 
     @property
     def device_class(self):
@@ -241,7 +241,8 @@ class Mega1WSensor(MegaPushEntity):
                 tmpl.hass = self.hass
                 ret = tmpl.async_render({'value': ret})
         except:
-            return ret
+            pass
+        return str(ret)
 
     @property
     def name(self):
@@ -255,4 +256,4 @@ class Mega1WSensor(MegaPushEntity):
 _constructors = {
     'sensor': Mega1WSensor,
     'i2c': MegaI2C,
-}
+}

custom_components/mega/tools.py

@@ -117,3 +117,8 @@ class PriorityLock(asyncio.Lock):
             fut.set_result(True)
 
 
+def map_reorder_rgb(rgb: list, from_: str, to_: str):
+    if from_ == to_:
+        return rgb
+    mapping = [from_.index(x) for x in to_]
+    return [rgb[x] for x in mapping]

readme.md

@@ -25,8 +25,7 @@
 - Плавное диммирование для любых диммируемых объектов (в том числе с аппаратной поддержкой и без),
   [подробнее про smooth](https://github.com/andvikt/mega_hacs/wiki/smooth)
 - Возможность работы с несколькими megad
-- Обратная связь по [http](https://github.com/andvikt/mega_hacs/wiki/http) 
-  будет выключена в версиях >= 1.0.0, тк в нем нет необходимости)
+- Обратная связь по [http](https://github.com/andvikt/mega_hacs/wiki/http)
 - Автоматическое восстановление состояний выходов после перезагрузки контроллера
 - Автоматическое добавление/изменение объектов после перезагрузки контроллера
 - [События](https://github.com/andvikt/mega_hacs/wiki/События) на двойные/долгие нажатия