add proxy support

.experiment.py

@@ -1,56 +1,30 @@
 import asyncio
-from urllib.parse import urlparse, parse_qsl
 from asyncio import Event, FIRST_COMPLETED
 import signal
-import typing
-from logging import getLogger, DEBUG
 
 
 stop = Event()
 loop = asyncio.get_event_loop()
-lg = getLogger(__name__)
-lg.setLevel(DEBUG)
 
 
-def make_handler(get_ans: typing.Callable[[dict], str]):
-
-    async def handler(
-            reader: asyncio.StreamReader,
-            writer: asyncio.StreamWriter,
-    ):
-        data = await reader.read(200)
-        print(data)
-        message = data.decode()
-        addr = writer.get_extra_info('peername')
-        lg.debug('process msg "%s" from %s', message, addr)
-        try:
-            (_, p, *_) = message.split(' ')
-            p = dict(parse_qsl(urlparse(p).query))
-            lg.debug('query %s', p)
-            ans = get_ans(p)
-            ans = f'''HTTP/1.1 200 OK\nContent-Length: {len(ans)}\n\n{ans}'''.encode()  # \nContent-Length: 6
-            ans = b'HTTP/1.1 200 OK\r\n\r\n7:2'
-            print(ans)
-        except Exception as exc:
-            print(exc)
-            lg.exception('process msg "%s" from %s', message, addr)
-            ans = '''HTTP/1.1 500\n\n'''.encode()
-        writer.write(ans)
-        await writer.drain()
-        # writer.transport.close()
-        writer.close()
-        await writer.wait_closed()
-    return handler
+async def handler(
+        reader: asyncio.StreamReader,
+        writer: asyncio.StreamWriter,
+):
+    await reader.read(100)
+    ans = b'HTTP/1.1 200 OK\r\nContent-Length:1\r\n\r\nd'
+    writer.write(ans)
+    await writer.drain()
+    writer.close()
+    await writer.wait_closed()
 
 
 async def serve():
     server = await asyncio.start_server(
-        make_handler(lambda x: '7:2'),
+        handler,
         host='0.0.0.0',
-        port=1111,
+        port=8888,
     )
-    addr = server.sockets[0].getsockname()
-    print(f'Serving on {addr}')
     async with server:
         await asyncio.wait((server.serve_forever(), stop.wait()), return_when=FIRST_COMPLETED)
 
@@ -58,4 +32,4 @@ if __name__ == '__main__':
     loop.add_signal_handler(
         signal.SIGINT, stop.set
     )
-    loop.run_until_complete(serve())
+    loop.run_until_complete(serve())

custom_components/mega/__init__.py

@@ -7,17 +7,16 @@ import voluptuous as vol
 
 from homeassistant.const import (
     CONF_SCAN_INTERVAL, CONF_ID, CONF_NAME, CONF_DOMAIN,
-    CONF_UNIT_OF_MEASUREMENT, CONF_HOST
+    CONF_UNIT_OF_MEASUREMENT, CONF_HOST, CONF_VALUE_TEMPLATE
 )
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers.service import bind_hass
-from homeassistant.helpers.template import Template
 from homeassistant.helpers import config_validation as cv
 from homeassistant.components import mqtt
 from homeassistant.config_entries import ConfigEntry
 from .const import DOMAIN, CONF_INVERT, CONF_RELOAD, PLATFORMS, CONF_PORTS, CONF_CUSTOM, CONF_SKIP, CONF_PORT_TO_SCAN, \
     CONF_MQTT_INPUTS, CONF_HTTP, CONF_RESPONSE_TEMPLATE, CONF_ACTION, CONF_GET_VALUE, CONF_ALLOW_HOSTS, \
-    CONF_CONV_TEMPLATE, CONF_ALL, CONF_FORCE_D
+    CONF_CONV_TEMPLATE, CONF_ALL, CONF_FORCE_D, CONF_DEF_RESPONSE
 from .hub import MegaD
 from .config_flow import ConfigFlow
 from .http import MegaView
@@ -41,7 +40,8 @@ CUSTOMIZE_PORT = {
                     'сообщение из меги '): cv.template,
     vol.Optional(CONF_ACTION): cv.script_action, # пока не реализовано
     vol.Optional(CONF_GET_VALUE, default=True): bool,
-    vol.Optional(CONF_CONV_TEMPLATE): cv.template
+    vol.Optional(CONF_CONV_TEMPLATE): cv.template,
+    vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
 }
 CUSTOMIZE_DS2413 = {
     vol.Optional(str.lower, description='адрес и индекс устройства'): CUSTOMIZE_PORT
@@ -53,6 +53,11 @@ CONFIG_SCHEMA = vol.Schema(
             vol.Optional(CONF_ALLOW_HOSTS): [str],
             vol.Required(str, description='id меги из веб-интерфейса'): {
                 vol.Optional(CONF_FORCE_D, description='Принудительно слать d после срабатывания входа', default=False): bool,
+                vol.Optional(
+                    CONF_DEF_RESPONSE,
+                    description='Ответ по умолчанию',
+                    default=None
+                ): vol.Any(cv.template, None),
                 vol.Optional(int, description='номер порта'): vol.Any(
                     CUSTOMIZE_PORT,
                     CUSTOMIZE_DS2413,

custom_components/mega/config_flow.py

@@ -10,7 +10,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_ID, CONF_PASSWORD, CONF_SCAN_INTERVAL
 from homeassistant.core import callback, HomeAssistant
 from .const import DOMAIN, CONF_PORT_TO_SCAN, CONF_RELOAD, PLATFORMS, CONF_MQTT_INPUTS, \
-    CONF_NPORTS, CONF_UPDATE_ALL, CONF_POLL_OUTS  # pylint:disable=unused-import
+    CONF_NPORTS, CONF_UPDATE_ALL, CONF_POLL_OUTS, CONF_FAKE_RESPONSE  # pylint:disable=unused-import
 from .hub import MegaD
 from . import exceptions
 
@@ -27,6 +27,7 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
         vol.Optional(CONF_MQTT_INPUTS, default=True): bool,
         vol.Optional(CONF_NPORTS, default=37): int,
         vol.Optional(CONF_UPDATE_ALL, default=True): bool,
+        vol.Optional(CONF_FAKE_RESPONSE, default=True): bool,
     },
 )
 
@@ -57,7 +58,7 @@ async def validate_input(hass: core.HomeAssistant, data):
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow for mega."""
 
-    VERSION = 6
+    VERSION = 10
     CONNECTION_CLASS = config_entries.CONN_CLASS_ASSUMED
 
     async def async_step_user(self, user_input=None):
@@ -138,6 +139,7 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
                 vol.Optional(CONF_NPORTS, default=e.get(CONF_NPORTS, 37)): int,
                 vol.Optional(CONF_RELOAD, default=False): bool,
                 vol.Optional(CONF_UPDATE_ALL, default=e.get(CONF_UPDATE_ALL, True)): bool,
+                vol.Optional(CONF_FAKE_RESPONSE, default=e.get(CONF_FAKE_RESPONSE, True)): bool,
                 # vol.Optional(CONF_INVERT, default=''): str,
             }),
         )

custom_components/mega/const.py

@@ -23,11 +23,13 @@ CONF_NPORTS = 'nports'
 CONF_RESPONSE_TEMPLATE = 'response_template'
 CONF_ACTION = 'action'
 CONF_UPDATE_ALL = 'update_all'
+CONF_FAKE_RESPONSE = 'fake_response'
 CONF_GET_VALUE = 'get_value'
 CONF_ALLOW_HOSTS = 'allow_hosts'
 CONF_CONV_TEMPLATE = 'conv_template'
 CONF_POLL_OUTS = 'poll_outs'
 CONF_FORCE_D = 'force_d'
+CONF_DEF_RESPONSE = 'def_response'
 PLATFORMS = [
     "light",
     "switch",

custom_components/mega/entities.py

@@ -253,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}: {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):
+                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:
+                    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}: {_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,23 +66,29 @@ 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]:
                 cb(data)
-            template: Template = self.templates.get(hub.id, {}).get(port)
+            template: Template = self.templates.get(hub.id, {}).get(port, hub.def_response)
             if hub.update_all and update_all:
                 asyncio.create_task(self.later_update(hub))
             if template is not None:
                 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='' if hub.fake_response else ret, content_type='text/plain')
+
+        if hub.fake_response:
+            if 'd' in ret:
+                await hub.request(pt=port, cmd=ret)
+            else:
+                await hub.request(cmd=ret)
         return ret
 
     async def later_update(self, hub):
-        _LOGGER.debug('force update')
         await asyncio.sleep(1)
+        _LOGGER.debug('force update')
         await hub.updater.async_refresh()
 

custom_components/mega/hub.py

@@ -19,7 +19,7 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from .const import (
     TEMP, HUM, PRESS,
     LUX, PATT_SPLIT, DOMAIN,
-    CONF_HTTP, EVENT_BINARY_SENSOR, CONF_CUSTOM, CONF_FORCE_D
+    CONF_HTTP, EVENT_BINARY_SENSOR, CONF_CUSTOM, CONF_FORCE_D, CONF_DEF_RESPONSE
 )
 from .entities import set_events_off, BaseMegaEntity
 from .exceptions import CannotConnect, NoPort
@@ -75,6 +75,7 @@ class MegaD:
             inverted: typing.List[int] = None,
             update_all=True,
             poll_outs=False,
+            fake_response=True,
             **kwargs,
     ):
         """Initialize."""
@@ -87,6 +88,7 @@ class MegaD:
         self.poll_outs = poll_outs
         self.update_all = update_all if update_all is not None else True
         self.nports = nports
+        self.fake_response = fake_response
         self.mqtt_inputs = mqtt_inputs
         self.loop: asyncio.AbstractEventLoop = None
         self.hass = hass
@@ -171,6 +173,10 @@ class MegaD:
     def force_d(self):
         return self.customize.get(CONF_FORCE_D, False)
 
+    @property
+    def def_response(self):
+        return self.customize.get(CONF_DEF_RESPONSE, None)
+
     @property
     def is_online(self):
         return (datetime.now() - self.last_update).total_seconds() < (self.poll_interval + 10)
@@ -254,13 +260,18 @@ class MegaD:
     async def save(self):
         await self.send_command(cmd='s')
 
-    def parse_response(self, ret):
+    def parse_response(self, ret, cmd='get'):
         if ret is None:
             raise NoPort()
         if 'busy' in ret:
             return None
         if ':' in ret:
-            ret = ret.split(';')
+            if ';' in ret:
+                ret = ret.split(';')
+            elif '/' in ret and not cmd == 'list':
+                ret = ret.split('/')
+            else:
+                ret = [ret]
             ret = {'value': dict([
                 x.split(':') for x in ret if x.count(':') == 1
             ])}
@@ -282,7 +293,7 @@ class MegaD:
             if http_cmd == 'list' and conv:
                 await self.request(pt=port, cmd='conv')
                 await asyncio.sleep(1)
-            ret = self.parse_response(await self.request(pt=port, cmd=http_cmd))
+            ret = self.parse_response(await self.request(pt=port, cmd=http_cmd), cmd=http_cmd)
             ntry = 0
             while http_cmd == 'list' and ret is None and ntry < 3:
                 await asyncio.sleep(1)
@@ -471,10 +482,15 @@ class MegaD:
             elif pty in ('3', '2', '4'):
                 try:
                     http_cmd = 'get'
-                    values = await self.get_port(port, force_http=True)
-                    if values is None or (isinstance(values, dict) and str(values.get('value')) in ('', 'None')):
+                    if m == '5' and pty == '3':
+                        # 1-wire bus
                         values = await self.get_port(port, force_http=True, http_cmd='list')
                         http_cmd = 'list'
+                    else:
+                        values = await self.get_port(port, force_http=True)
+                        if values is None or (isinstance(values, dict) and str(values.get('value')) in ('', 'None')):
+                            values = await self.get_port(port, force_http=True, http_cmd='list')
+                            http_cmd = 'list'
                 except asyncio.TimeoutError:
                     self.lg.warning(f'timout on port {port}')
                     continue

custom_components/mega/manifest.json

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

custom_components/mega/sensor.py

@@ -13,7 +13,7 @@ from homeassistant.const import (
     CONF_PORT,
     CONF_UNIQUE_ID,
     CONF_ID,
-    CONF_TYPE, CONF_UNIT_OF_MEASUREMENT,
+    CONF_TYPE, CONF_UNIT_OF_MEASUREMENT, CONF_VALUE_TEMPLATE,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.template import Template
@@ -163,7 +163,7 @@ class Mega1WSensor(MegaPushEntity):
             ret = str(ret)
         except:
             ret = None
-        tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE)
+        tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE))
         if tmpl is not None and self.hass is not None:
             tmpl.hass = self.hass
             ret = tmpl.async_render({'value': ret})

custom_components/mega/strings.json

@@ -15,6 +15,7 @@
           "mqtt_inputs": "[%key:common::config_flow::data::mqtt_inputs%]",
           "nports": "[%key:common::config_flow::data::nports%]",
           "update_all": "[%key:common::config_flow::data::update_all%]",
+          "fake_response": "[%key:common::config_flow::data::fake_response%]",
           "poll_outs": "[%key:common::config_flow::data::poll_outs%]"
         }
       }

custom_components/mega/translations/en.json

@@ -23,6 +23,7 @@
                     "nports": "Number of ports",
                     "update_all": "Update all outs when input",
                     "mqtt_inputs": "Use MQTT",
+                    "fake_response": "Fake response",
                     "poll_outs": "Poll outs"
                 }
             }
@@ -37,6 +38,7 @@
                   "reload": "Reload objects",
                   "mqtt_inputs": "Use MQTT",
                   "update_all": "Update all outs when input",
+                  "fake_response": "Fake response",
                   "poll_outs": "Poll outs"
                 }
             }

custom_components/mega/translations/ru.json

@@ -22,6 +22,7 @@
                     "mqtt_inputs": "Использовать MQTT",
                     "nports": "Кол-во портов",
                     "update_all": "Обновить все выходы когда срабатывает вход",
+                    "fake_response": "Имитация http-ответа",
                     "poll_outs": "Обновлять выходы (регулярно)"
                 }
             }
@@ -36,6 +37,7 @@
                   "reload": "Обновить объекты",
                   "invert": "Список портов (через ,) с инвертированной логикой",
                   "mqtt_inputs": "Использовать MQTT",
+                    "fake_response": "Имитация http-ответа",
                     "nports": "Кол-во портов",
                     "update_all": "Обновить все выходы когда срабатывает вход",
                     "poll_outs": "Обновлять выходы (регулярно)"

custom_components/mega/translations/uk.json

@@ -22,6 +22,7 @@
                     "mqtt_inputs": "Використовувати MQTT",
                     "nports": "Кількість портів",
                     "update_all": "Оновити всі виходи коли спрацьовує вхід",
+                    "fake_response": "Имитация http-ответа",
                     "poll_outs": "Оновити виходи"
                 }
             }
@@ -37,6 +38,7 @@
                   "invert": "Список портів з інвертованою логікою (через ,)",
                   "mqtt_inputs": "Використовувати MQTT",
                   "nports": "Кількість портів",
+                    "fake_response": "Имитация http-ответа",
                   "update_all": "Оновити всі виходи коли спрацьовує вхід",
                     "poll_outs": "Оновити виходи"
                 }

readme.md

@@ -12,6 +12,9 @@
 Обновление прошивки MegaD можно делать прямо из HA с помощью [аддона](https://github.com/andvikt/mega_addon.git)
 
 Подробная документация по [ссылке](https://github.com/andvikt/mega_hacs/wiki)
+
+Предложения по доработкам просьба писать в [discussions](https://github.com/andvikt/mega_hacs/discussions), о проблемах
+создавать [issue](https://github.com/andvikt/mega_hacs/issues/new/choose)
 ## Основные особенности:
 - Настройка в веб-интерфейсе + yaml
 - Все порты автоматически добавляются как устройства (для обычных релейных выходов создается