Got webhook trigger functioning!

Author: contagon

custom_components/pyscript/eval.py

@@ -75,6 +75,8 @@
     "trigger_time",
     "var_name",
     "value",
+    "webhook_id",
+    "webhook_data",
 }
 
 

custom_components/pyscript/webhook.py

@@ -4,6 +4,10 @@
 
 from .const import LOGGER_PATH
 
+from aiohttp import hdrs
+
+from homeassistant.components import webhook
+
 _LOGGER = logging.getLogger(LOGGER_PATH + ".webhook")
 
 
@@ -32,45 +36,58 @@ def init(cls, hass):
         cls.hass = hass
 
     @classmethod
-    async def webhook_listener(cls, event):
+    async def webhook_handler(cls, hass, webhook_id, request):
         """Listen callback for given webhook which updates any notifications."""
 
         func_args = {
-            "trigger_type": "event",
-            "event_type": event.event_type,
-            "context": event.context,
+            "trigger_type": "webhook",
+            "webhook_id": webhook_id,
         }
-        func_args.update(event.data)
-        await cls.update(event.event_type, func_args)
+
+        if "json" in request.headers.get(hdrs.CONTENT_TYPE, ""):
+            func_args["webhook_data"] = await request.json()
+        else:
+            func_args["webhook_data"] = await request.post()
+
+
+        await cls.update(webhook_id, func_args)
 
     @classmethod
-    def notify_add(cls, webhook_type, queue):
+    def notify_add(cls, webhook_id, queue):
         """Register to notify for webhooks of given type to be sent to queue."""
 
-        if webhook_type not in cls.notify:
-            cls.notify[webhook_type] = set()
-            _LOGGER.debug("webhook.notify_add(%s) -> adding webhook listener", webhook_type)
-            cls.notify_remove[webhook_type] = cls.hass.bus.async_listen(webhook_type, cls.webhook_listener)
-        cls.notify[webhook_type].add(queue)
+        if webhook_id not in cls.notify:
+            cls.notify[webhook_id] = set()
+            _LOGGER.debug("webhook.notify_add(%s) -> adding webhook listener", webhook_id)
+            webhook.async_register(
+                cls.hass,
+                "webhook",
+                "my_name",
+                webhook_id,
+                cls.webhook_handler,
+            )
+            cls.notify_remove[webhook_id] = lambda : webhook.async_unregister(cls.hass, webhook_id)
+
+        cls.notify[webhook_id].add(queue)
 
     @classmethod
-    def notify_del(cls, webhook_type, queue):
+    def notify_del(cls, webhook_id, queue):
         """Unregister to notify for webhooks of given type for given queue."""
 
-        if webhook_type not in cls.notify or queue not in cls.notify[webhook_type]:
+        if webhook_id not in cls.notify or queue not in cls.notify[webhook_id]:
             return
-        cls.notify[webhook_type].discard(queue)
-        if len(cls.notify[webhook_type]) == 0:
-            cls.notify_remove[webhook_type]()
-            _LOGGER.debug("webhook.notify_del(%s) -> removing webhook listener", webhook_type)
-            del cls.notify[webhook_type]
-            del cls.notify_remove[webhook_type]
+        cls.notify[webhook_id].discard(queue)
+        if len(cls.notify[webhook_id]) == 0:
+            cls.notify_remove[webhook_id]()
+            _LOGGER.debug("webhook.notify_del(%s) -> removing webhook listener", webhook_id)
+            del cls.notify[webhook_id]
+            del cls.notify_remove[webhook_id]
 
     @classmethod
-    async def update(cls, webhook_type, func_args):
+    async def update(cls, webhook_id, func_args):
         """Deliver all notifications for an webhook of the given type."""
 
-        _LOGGER.debug("webhook.update(%s, %s)", webhook_type, func_args)
-        if webhook_type in cls.notify:
-            for queue in cls.notify[webhook_type]:
+        _LOGGER.debug("webhook.update(%s, %s)", webhook_id, func_args)
+        if webhook_id in cls.notify:
+            for queue in cls.notify[webhook_id]:
                 await queue.put(["webhook", func_args.copy()])