add new events, fix binsensor

fix mqtt
smaller headers
2025-12-12 17:44:28 +05:00 · 2021-01-27 21:40:55 +03:00 · 2021-01-26 08:34:27 +03:00 · 2021-01-25 21:35:06 +03:00 · 2021-01-25 20:17:15 +03:00 · 2021-01-25 18:45:23 +03:00
9 changed files with 196 additions and 73 deletions
--- a/.experiment.py
+++ b/.experiment.py
@@ -0,0 +1,32 @@
 import asyncio
 async def handle_echo(reader: asyncio.StreamReader, writer: asyncio.StreamWriter):
    data = await reader.read(100)
    message = data.decode()
    addr = writer.get_extra_info('peername')
    print(f"Received {message!r} from {addr!r}")
    print(f"Send: {message!r}")
    ans = '''HTTP/1.1 200 OK\nContent-Length: 6\n\nhello\n'''.encode()
    writer.write(ans)
    await writer.drain()
    print("Close the connection")
    writer.transport.close()
    writer.close()
    await writer.wait_closed()
 async def main():
    server = await asyncio.start_server(
        handle_echo, '127.0.0.1', 8888)
    addr = server.sockets[0].getsockname()
    print(f'Serving on {addr}')
    async with server:
        await server.serve_forever()
 asyncio.run(main())
--- a/custom_components/mega/.experiment.py
+++ b/custom_components/mega/.experiment.py
@@ -1,36 +0,0 @@
 import asyncio
 from bs4 import BeautifulSoup
 import aiohttp
 host = '192.168.88.14/sec'
 # page = '''
 # <html><head><style>input,select{margin:1px}</style></head><body><a href="/sec/?cf=3">Back</a><br>P7/ON<br><a href="/sec/?pt=7&amp;cmd=7:1">ON</a> <a href="/sec/?pt=7&amp;cmd=7:0">OFF</a><br><form action="/sec/"><input type="hidden" name="pn" value="7">Type <select name="pty"><option value="255">NC</option><option value="0">In</option><option value="1" selected="">Out</option><option value="3">DSen</option><option value="4">I2C</option></select><br>Default: <select name="d"><option value="0" selected="">0</option><option value="1">1</option></select><br>Mode <select name="m"><option value="0" selected="">SW</option><option value="3">SW LINK</option><option value="2">DS2413</option></select><br>Group <input name="grp" size="2" value=""><br><input type="submit" value="Save"></form></body></html>
 # <head><style>input,select{margin:1px}</style></head>
 # <body><a href="/sec/?cf=3">Back</a><br>P7/ON<br><a href="/sec/?pt=7&amp;cmd=7:1">ON</a> <a href="/sec/?pt=7&amp;cmd=7:0">OFF</a><br><form action="/sec/"><input type="hidden" name="pn" value="7">Type <select name="pty"><option value="255">NC</option><option value="0">In</option><option value="1" selected="">Out</option><option value="3">DSen</option><option value="4">I2C</option></select><br>Default: <select name="d"><option value="0" selected="">0</option><option value="1">1</option></select><br>Mode <select name="m"><option value="0" selected="">SW</option><option value="3">SW LINK</option><option value="2">DS2413</option></select><br>Group <input name="grp" size="2" value=""><br><input type="submit" value="Save"></form></body>
 # <a href="/sec/?cf=3">Back</a>
 # <br>
 # P7/ON
 # <br>
 # <a href="/sec/?pt=7&amp;cmd=7:1">ON</a>
 # <a href="/sec/?pt=7&amp;cmd=7:0">OFF</a>
 # <br>
 # <form action="/sec/"><input type="hidden" name="pn" value="7">Type <select name="pty"><option value="255">NC</option><option value="0">In</option><option value="1" selected="">Out</option><option value="3">DSen</option><option value="4">I2C</option></select><br>Default: <select name="d"><option value="0" selected="">0</option><option value="1">1</option></select><br>Mode <select name="m"><option value="0" selected="">SW</option><option value="3">SW LINK</option><option value="2">DS2413</option></select><br>Group <input name="grp" size="2" value=""><br><input type="submit" value="Save"></form>
 # <body><a href="/sec/?cf=3">Back</a><br>P7/ON<br><a href="/sec/?pt=7&amp;cmd=7:1">ON</a> <a href="/sec/?pt=7&amp;cmd=7:0">OFF</a><br><form action="/sec/"><input type="hidden" name="pn" value="7">Type <select name="pty"><option value="255">NC</option><option value="0">In</option><option value="1" selected="">Out</option><option value="3">DSen</option><option value="4">I2C</option></select><br>Default: <select name="d"><option value="0" selected="">0</option><option value="1">1</option></select><br>Mode <select name="m"><option value="0" selected="">SW</option><option value="3">SW LINK</option><option value="2">DS2413</option></select><br>Group <input name="grp" size="2" value=""><br><input type="submit" value="Save"></form></body>
 # <html><head><style>input,select{margin:1px}</style></head><body><a href="/sec/?cf=3">Back</a><br>P7/ON<br><a href="/sec/?pt=7&amp;cmd=7:1">ON</a> <a href="/sec/?pt=7&amp;cmd=7:0">OFF</a><br><form action="/sec/"><input type="hidden" name="pn" value="7">Type <select name="pty"><option value="255">NC</option><option value="0">In</option><option value="1" selected="">Out</option><option value="3">DSen</option><option value="4">I2C</option></select><br>Default: <select name="d"><option value="0" selected="">0</option><option value="1">1</option></select><br>Mode <select name="m"><option value="0" selected="">SW</option><option value="3">SW LINK</option><option value="2">DS2413</option></select><br>Group <input name="grp" size="2" value=""><br><input type="submit" value="Save"></form></body></html>
 # '''
 # tree = BeautifulSoup(page, features="lxml")
 # pty = tree.find('select', attrs={'name': 'pty'}).find(selected=True)['value']
 # m = tree.find('select', attrs={'name': 'm'})
 # if m:
 #     m = m.find(selected=True)['value']
 #
 # print(pty, m)
 if __name__ == '__main__':
    asyncio.get_event_loop().run_until_complete(
        scan_port(0)
    )
--- a/custom_components/mega/binary_sensor.py
+++ b/custom_components/mega/binary_sensor.py
@@ -78,7 +78,7 @@ class MegaBinarySensor(BinarySensorEntity, MegaPushEntity):
        if val is None and self._state is not None:
            return self._state == 'ON'
        elif val is not None:
-            return val == 'ON' or val == 1
+            return val == 'ON' or val != 1
    def _update(self, payload: dict):
        self.mega.values[self.port] = payload
--- a/custom_components/mega/const.py
+++ b/custom_components/mega/const.py
@@ -31,4 +31,13 @@ PLATFORMS = [
    "sensor",
 ]
 EVENT_BINARY_SENSOR = f'{DOMAIN}.sensor'
 EVENT_BINARY = f'{DOMAIN}.binary'
 PATT_SPLIT = re.compile('[;/]')
 LONG = 'long'
 RELEASE = 'release'
 LONG_RELEASE = 'long_release'
 PRESS = 'press'
 SINGLE_CLICK = 'single'
 DOUBLE_CLICK = 'double'
--- a/custom_components/mega/entities.py
+++ b/custom_components/mega/entities.py
@@ -1,12 +1,14 @@
 import logging
 import asyncio
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import State
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.helpers.restore_state import RestoreEntity
 from .hub import MegaD
-from .const import DOMAIN, CONF_CUSTOM, CONF_INVERT
+from .const import DOMAIN, CONF_CUSTOM, CONF_INVERT, EVENT_BINARY_SENSOR, LONG, \
    LONG_RELEASE, RELEASE, PRESS, SINGLE_CLICK, DOUBLE_CLICK
 class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
@@ -59,7 +61,7 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
            "config_entries": [
                self.config_entry,
            ],
-            "name": f'port {self.port}',
+            "name": f'{self._mega_id} port {self.port}',
            "manufacturer": 'ab-log.ru',
            # "model": self.light.productname,
            # "sw_version": self.light.swversion,
@@ -111,7 +113,51 @@ class MegaPushEntity(BaseMegaEntity):
        self._update(value)
        self.async_write_ha_state()
        self.lg.debug(f'state after update %s', self.state)
-        self.is_first_update = False
+        if not self.entity_id.startswith('binary_sensor'):
            return
        ll: bool = self.mega.last_long.get(self.port, False)
        if safe_int(value.get('click', 0)) == 1:
            self.hass.bus.async_fire(
                event_type=EVENT_BINARY_SENSOR,
                event_data={
                    'entity_id': self.entity_id,
                    'type': SINGLE_CLICK
                }
            )
        elif safe_int(value.get('click', 0)) == 2:
            self.hass.bus.async_fire(
                event_type=EVENT_BINARY_SENSOR,
                event_data={
                    'entity_id': self.entity_id,
                    'type': DOUBLE_CLICK
                }
            )
        elif safe_int(value.get('m', 0)) == 2:
            self.mega.last_long[self.port] = True
            self.hass.bus.async_fire(
                event_type=EVENT_BINARY_SENSOR,
                event_data={
                    'entity_id': self.entity_id,
                    'type': LONG
                }
            )
        elif safe_int(value.get('m', 0)) == 1:
            self.hass.bus.async_fire(
                event_type=EVENT_BINARY_SENSOR,
                event_data={
                    'entity_id': self.entity_id,
                    'type': LONG_RELEASE if ll else RELEASE,
                }
            )
        elif safe_int(value.get('m', None)) == 0:
            self.hass.bus.async_fire(
                event_type=EVENT_BINARY_SENSOR,
                event_data={
                    'entity_id': self.entity_id,
                    'type': PRESS,
                }
            )
            self.mega.last_long[self.port] = False
        return
    def _update(self, payload: dict):
@@ -155,10 +201,12 @@ class MegaOutPort(MegaPushEntity):
    @property
    def is_on(self) -> bool:
-        val = self.mega.values.get(self.port, {}).get("value")
+        val = self.mega.values.get(self.port, {})
        if val is None and self._state is not None:
            return self._state == 'ON'
        elif val is not None:
            val = val.get("value")
            if not self.invert:
                return val == 'ON' or str(val) == '1' or (safe_int(val) is not None and safe_int(val) > 0)
            else:
@@ -186,10 +234,11 @@ class MegaOutPort(MegaPushEntity):
        self.mega.values[self.port] = {'value': cmd}
        await self.get_state()
 def safe_int(v):
    if v in ['ON', 'OFF']:
        return None
    try:
        return int(v)
-    except ValueError:
+    except (ValueError, TypeError):
        return None
--- a/custom_components/mega/http.py
+++ b/custom_components/mega/http.py
@@ -8,11 +8,11 @@ from aiohttp.web_request import Request
 from aiohttp.web_response import Response
 from homeassistant.helpers.template import Template
-from .const import EVENT_BINARY_SENSOR, CONF_HTTP, DOMAIN, CONF_CUSTOM, CONF_RESPONSE_TEMPLATE
+from .const import EVENT_BINARY_SENSOR, DOMAIN, CONF_RESPONSE_TEMPLATE
 from homeassistant.components.http import HomeAssistantView
-from homeassistant.core import callback, HomeAssistant
+from homeassistant.core import HomeAssistant
-from . import hub
+from .tools import make_ints
-
+from . import hub as h
 _LOGGER = logging.getLogger(__name__).getChild('http')
@@ -26,8 +26,7 @@ class MegaView(HomeAssistantView):
    def __init__(self, cfg: dict):
        self._try = 0
        self.allowed_hosts = {'::1'}
-        self.callbacks: typing.DefaultDict[int, typing.List[typing.Callable[[dict], typing.Coroutine]]] \
+        self.callbacks = defaultdict(lambda: defaultdict(list))
            = defaultdict(list)
        self.templates: typing.Dict[str, typing.Dict[str, Template]] = {
            mid: {
                pt: cfg[mid][pt][CONF_RESPONSE_TEMPLATE]
@@ -38,6 +37,7 @@ class MegaView(HomeAssistantView):
        _LOGGER.debug('templates: %s', self.templates)
    async def get(self, request: Request) -> Response:
        auth = False
        for x in self.allowed_hosts:
            if request.remote.startswith(x):
@@ -48,7 +48,7 @@ class MegaView(HomeAssistantView):
            return Response(status=401)
        hass: HomeAssistant = request.app['hass']
-        hub: 'hub.MegaD' = hass.data.get(DOMAIN).get(request.remote)  # TODO: проверить какой remote
+        hub: 'h.MegaD' = hass.data.get(DOMAIN).get(request.remote)  # TODO: проверить какой remote
        if hub is None and request.remote == '::1':
            hub = hass.data.get(DOMAIN).get('__def')
        if hub is None:
@@ -62,9 +62,11 @@ class MegaView(HomeAssistantView):
        make_ints(data)
        port = data.get('pt')
        data = data.copy()
        data['mega_id'] = hub.id
        ret = 'd'
        if port is not None:
-            for cb in self.callbacks[port]:
+            hub.values[port] = data
            for cb in self.callbacks[hub.id][port]:
                cb(data)
            template: Template = self.templates.get(hub.id, {}).get(port)
            if hub.update_all:
@@ -73,8 +75,7 @@ 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={})
+        ret = Response(body=ret or 'd', content_type='text/plain', headers={'Server': 's', 'Date': 'n'})
        ret.headers.clear()
        return ret
    async def later_update(self, hub):
@@ -82,14 +83,3 @@ class MegaView(HomeAssistantView):
        await asyncio.sleep(1)
        await hub.updater.async_refresh()
 def make_ints(d: dict):
    for x in d:
        try:
            d[x] = float(d[x])
        except ValueError:
            pass
    if 'm' not in d:
        d['m'] = 0
    if 'click' not in d:
        d['click'] = 0
--- a/custom_components/mega/hub.py
+++ b/custom_components/mega/hub.py
@@ -14,9 +14,9 @@ from homeassistant.const import DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_HUMIDITY
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-from .const import TEMP, HUM, PATT_SPLIT, DOMAIN, CONF_HTTP
+from .const import TEMP, HUM, PATT_SPLIT, DOMAIN, CONF_HTTP, EVENT_BINARY_SENSOR
-from .exceptions import CannotConnect, MqttNotConfigured
+from .exceptions import CannotConnect
-from .http import MegaView
+from .tools import make_ints
 TEMP_PATT = re.compile(r'temp:([01234567890\.]+)')
 HUM_PATT = re.compile(r'hum:([01234567890\.]+)')
@@ -60,7 +60,8 @@ class MegaD:
    ):
        """Initialize."""
        if mqtt_inputs is None or mqtt_inputs == 'None' or mqtt_inputs is False:
-            self.http = hass.data[DOMAIN][CONF_HTTP]
+            self.http = hass.data.get(DOMAIN, {}).get(CONF_HTTP)
            if not self.http is None:
                self.http.allowed_hosts |= {host}
        else:
            self.http = None
@@ -74,6 +75,7 @@ class MegaD:
        self.mqtt = mqtt
        self.id = id
        self.lck = asyncio.Lock()
        self.last_long = {}
        self._http_lck = asyncio.Lock()
        self._notif_lck = asyncio.Lock()
        self.cnd = asyncio.Condition()
@@ -289,9 +291,18 @@ class MegaD:
        value = None
        try:
            value = json.loads(msg.payload)
            if isinstance(value, dict):
                make_ints(value)
            self.values[port] = value
            for cb in self._callbacks[port]:
                cb(value)
            if isinstance(value, dict):
                value = value.copy()
                value['mega_id'] = self.id
                self.hass.bus.async_fire(
                    EVENT_BINARY_SENSOR,
                    value,
                )
        except Exception as exc:
            self.lg.warning(f'could not parse json ({msg.payload}): {exc}')
            return
@@ -306,7 +317,7 @@ class MegaD:
        if self.mqtt_inputs:
            self._callbacks[port].append(callback)
        else:
-            self.http.callbacks[port].append(callback)
+            self.http.callbacks[self.id][port].append(callback)
    async def authenticate(self) -> bool:
        """Test if we can authenticate with the host."""
@@ -360,7 +371,7 @@ class MegaD:
                return pty, m
    async def scan_ports(self, nports=37):
-        for x in range(1, nports+1):
+        for x in range(0, nports+1):
            ret = await self.scan_port(x)
            if ret:
                yield [x, *ret]
@@ -371,7 +382,7 @@ class MegaD:
        async for port, pty, m in self.scan_ports(nports):
            if pty == "0":
                ret['binary_sensor'][port].append({})
-            elif pty == "1" and m in ['0', '1']:
+            elif pty == "1" and (m in ['0', '1', '3'] or m is None):
                ret['light'][port].append({'dimmer': m == '1'})
            elif pty == '3':
                try:
--- a/custom_components/mega/tools.py
+++ b/custom_components/mega/tools.py
@@ -0,0 +1,12 @@
 _params = ['m', 'click', 'cnt', 'pt']
 def make_ints(d: dict):
    for x in _params:
        try:
            d[x] = int(d.get(x, 0))
        except (ValueError, TypeError):
            pass
    if 'm' not in d:
        d['m'] = 0
    if 'click' not in d:
        d['click'] = 0
--- a/readme.md
+++ b/readme.md
@@ -81,18 +81,42 @@ script: "mega" # это api интеграции, к которому будет
      event_type: mega.sensor
      event_data:
        pt: 1
        click: 2
  action:
    - service: light.toggle
      entity_id: light.some_light
 ```
 Для binary_sensor имеет смысл использовать режим P&R, для остальных режимов - лучше пользоваться событиями.
 Примеры использования binary_sensor:
 ```yaml
 - alias: обработка долгих/коротких нажатий
  trigger:
    - platform: state
      entity_id: binary_sensor.some_sensor
      to: on
      for: 1 # задержка на секунду
  action:
    - choose:
          # если кнопка все еще нажата - значит это долгое нажатие
        - conditions: "{{ is_state('binary_sensor.some_sensor', 'on')}}"
          sequence:
          - service: light.turn_on
            entity_id: light.some_light
          # если кнопка уже не нажата - значит это короткое нажатие
        - conditions: "{{ is_state('binary_sensor.some_sensor', 'off')}}"
          sequence:
          - service: light.turn_off
            entity_id: light.some_light
 ```
 ## Ответ на входящие события от контроллера
 Контроллер ожидает ответ от сервера, который может быть сценарием (по умолчанию интеграция отвечает `d`, что означает 
 запустить то что прописано в поле act в настройках порта).
 Поддерживаеются шаблоны HA. Это может быть использовано, например, для запоминания яркости (тк сам контроллер этого не 
-умеет). В шаблоне можно использовать параметры, которые передает контроллер (m, click, pt, value)
+умеет). В шаблоне можно использовать параметры, которые передает контроллер (m, click, pt, mdid, mega_id)
 Примеры:
 ```yaml
@@ -143,6 +167,7 @@ curl -v -X GET 'http://192.168.88.1.4:8123/mega?pt=5&m=1'
 При каждом срабатывании `binary_sensor` так же сообщает о событии типа `mega.sensor`.
 События можно использовать в автоматизациях, например так:
 ```yaml
 # Пример события с полями как есть прямо из меги
 - alias: some double click
  trigger:
    - platform: event
@@ -154,6 +179,37 @@ curl -v -X GET 'http://192.168.88.1.4:8123/mega?pt=5&m=1'
    - service: light.toggle
      entity_id: light.some_light
 ```
 События могут содержать следующие поля: 
 - mega_id: id как в конфиге HA
 - pt: номер порта
 - cnt: счетчик срабатываний
 - mdid: if как в конфиге контроллера
 - click: клик (подробнее в документации меги)
 - value: текущее значение (только для mqtt)
 - port: номер порта
 Начиная с версии 0.3.7 появилось так же событие типа mega.binary:
 ```yaml
 # Пример события с полями как есть прямо из меги
 - alias: some long click
  trigger:
    - platform: event
      event_type: mega.binary
      event_data:
        entity_id: binary_sensor.some_id
        type: long
  action:
    - service: light.toggle
      entity_id: light.some_light
 ```
 Возможные варианты поля `type`:
 - `long`: долгое нажатие
 - `release`: размыкание (с гарантией что не было долгого нажатия)
 - `long_release`: размыкание после долгого нажатия
 - `press`: замыкание
 - `single`: одинарный клик (в режиме кликов)
 - `double`: двойной клик
 Чтобы понять, какие события происходят, лучше всего воспользоваться панелью разработчика и подписаться
 на вкладке события на событие `mega.sensor`, понажимать кнопки.
Author	SHA1	Message	Date
Andrey	6d3391bc45	add new events, fix binsensor	2021-01-27 21:40:55 +03:00
Andrey	a7d7738a5c	fix mqtt	2021-01-26 08:34:27 +03:00
Andrey	c0b1247b9e	smaller headers	2021-01-25 21:35:06 +03:00
Andrey	1548e8c364	fix multiple megas	2021-01-25 20:17:15 +03:00
Andrey	39c4ab0e3b	fix device name	2021-01-25 18:45:23 +03:00
Andrey	a002e48e04	fix old mega out type 0	2021-01-25 18:13:25 +03:00
Andrey	dc6bdfc8f4	fix yaml exclusion	2021-01-25 17:56:47 +03:00
Andrey	e51b50797c	fix yaml exclusion	2021-01-25 17:46:26 +03:00
Andrey	c4205c7ddc	fix sw-link	2021-01-25 17:23:33 +03:00
Andrey	6164966d0b	fix scanning	2021-01-25 17:21:55 +03:00