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()
+    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.transport.close()
     writer.close()
     await writer.wait_closed()
-    return handler
 
 
 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)
 

custom_components/mega/__init__.py

@@ -7,11 +7,10 @@ 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
@@ -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
@@ -56,8 +56,8 @@ CONFIG_SCHEMA = vol.Schema(
                 vol.Optional(
                     CONF_DEF_RESPONSE,
                     description='Ответ по умолчанию',
-                    default=''
-                ): cv.template,
+                    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,
     },
 )
 
@@ -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,6 +23,7 @@ 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'

custom_components/mega/http.py

@@ -78,7 +78,9 @@ class MegaView(HomeAssistantView):
                 template.hass = hass
                 ret = template.async_render(data)
         _LOGGER.debug('response %s', ret)
-        Response(body='', 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:

custom_components/mega/hub.py

@@ -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

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": "Оновити виходи"
                 }