support multiple triggers per webhook_id

Author: dmamelin

custom_components/pyscript/decorators/webhook.py

@@ -1,6 +1,9 @@
 """Webhook decorator."""
 
+from __future__ import annotations
+
 import logging
+from typing import ClassVar
 
 from aiohttp import hdrs
 import voluptuous as vol
@@ -36,6 +39,8 @@ class WebhookTriggerDecorator(TriggerDecorator, ExpressionDecorator, AutoKwargsD
     local_only: bool
     methods: set[str]
 
+    webhook_id2triggers: ClassVar[dict[str, set[WebhookTriggerDecorator]]] = {}
+
     async def validate(self):
         """Validate the webhook trigger configuration."""
         await super().validate()
@@ -44,7 +49,8 @@ async def validate(self):
         if len(self.args) == 2:
             self.create_expression(self.args[1])
 
-    async def _handler(self, hass, webhook_id, request):
+    @staticmethod
+    async def _handler(_hass, webhook_id, request):
         func_args = {
             "trigger_type": "webhook",
             "webhook_id": webhook_id,
@@ -57,28 +63,50 @@ async def _handler(self, hass, webhook_id, request):
             payload_multidict = await request.post()
             func_args["payload"] = {k: payload_multidict.getone(k) for k in payload_multidict.keys()}
 
-        if self.has_expression():
-            if not await self.check_expression_vars(func_args):
-                return
-
-        await self.dispatch(DispatchData(func_args))
+        for trigger in WebhookTriggerDecorator.webhook_id2triggers.get(webhook_id, set()).copy():
+            trigger_args = func_args.copy()
+            if trigger.has_expression():
+                if not await trigger.check_expression_vars(trigger_args):
+                    continue
+            await trigger.dispatch(DispatchData(trigger_args))
+
+    @staticmethod
+    def _add_trigger(trigger: WebhookTriggerDecorator) -> None:
+        webhook_id = trigger.webhook_id
+        if webhook_id not in WebhookTriggerDecorator.webhook_id2triggers:
+            webhook.async_register(
+                trigger.dm.hass,
+                "pyscript",  # DOMAIN
+                "pyscript",  # NAME
+                webhook_id,
+                WebhookTriggerDecorator._handler,
+                local_only=trigger.local_only,
+                allowed_methods=trigger.methods,
+            )
+            WebhookTriggerDecorator.webhook_id2triggers[webhook_id] = set()
+
+        WebhookTriggerDecorator.webhook_id2triggers[webhook_id].add(trigger)
+
+    @staticmethod
+    def _remove_trigger(trigger: WebhookTriggerDecorator) -> None:
+        webhook_id = trigger.webhook_id
+        triggers = WebhookTriggerDecorator.webhook_id2triggers.get(webhook_id)
+        if not triggers:
+            return
+
+        triggers.discard(trigger)
+        if len(triggers) == 0:
+            webhook.async_unregister(trigger.dm.hass, webhook_id)
+            del WebhookTriggerDecorator.webhook_id2triggers[webhook_id]
 
     async def start(self):
         """Start the webhook trigger."""
         await super().start()
-        webhook.async_register(
-            self.dm.hass,
-            "pyscript",  # DOMAIN
-            "pyscript",  # NAME
-            self.webhook_id,
-            self._handler,
-            local_only=self.local_only,
-            allowed_methods=self.methods,
-        )
+        self._add_trigger(self)
 
         _LOGGER.debug("webhook trigger %s listening on id %s", self.dm.name, self.webhook_id)
 
     async def stop(self):
         """Stop the webhook trigger."""
         await super().stop()
-        webhook.async_unregister(self.dm.hass, self.webhook_id)
+        self._remove_trigger(self)