diff --git a/gateway/platforms/bluebubbles.py b/gateway/platforms/bluebubbles.py index 703b10f636..6755d7bf11 100644 --- a/gateway/platforms/bluebubbles.py +++ b/gateway/platforms/bluebubbles.py @@ -226,13 +226,14 @@ class BlueBubblesAdapter(BasePlatformAdapter): app.router.add_post(self.webhook_path, self._handle_webhook) # The webhook auth value rides in the query string (BlueBubbles cannot send custom headers) # — keep it out of aiohttp access logs. - self._runner = web.AppRunner(app, access_log=None) - await self._runner.setup() - site = web.TCPSite(self._runner, self.webhook_host, self.webhook_port) - await site.start() + # Shared-listener mode (multiplex secondary): no bind; served at /p//. + from gateway.platforms.shared_ingress import bind_listener + self._runner = await bind_listener( + self, app, self.webhook_host, self.webhook_port, self.webhook_path, access_log=None) self._mark_connected() - logger.info("[bluebubbles] webhook listening on http://%s:%s%s", self.webhook_host, self.webhook_port, - self.webhook_path) + if self._runner is not None: + logger.info("[bluebubbles] webhook listening on http://%s:%s%s", self.webhook_host, self.webhook_port, + self.webhook_path) await self._register_webhook() # the server only sends events to webhooks registered via its API # Plugin-registered native handlers (ctx.register_platform_handler). self._wire_plugin_handlers(None) @@ -253,7 +254,11 @@ class BlueBubblesAdapter(BasePlatformAdapter): @property def _webhook_url(self) -> str: - """External webhook URL for BlueBubbles registration (local binds → localhost).""" + """External webhook URL for BlueBubbles registration (local binds → localhost). In + shared-listener mode it is the default listener's ``/p//`` URL.""" + shared = getattr(self, "_shared_ingress_url", None) + if shared: + return shared host = "localhost" if self.webhook_host in _LOCAL_HOSTS else self.webhook_host return f"http://{host}:{self.webhook_port}{self.webhook_path}" diff --git a/gateway/platforms/msgraph_webhook.py b/gateway/platforms/msgraph_webhook.py index 326aed18c6..a891f96380 100644 --- a/gateway/platforms/msgraph_webhook.py +++ b/gateway/platforms/msgraph_webhook.py @@ -143,12 +143,12 @@ class MSGraphWebhookAdapter(BasePlatformAdapter): app.router.add_post(self._webhook_path, self._handle_notification) # Plugin-registered native routes; wired before AppRunner.setup() freezes the router. self._wire_plugin_handlers(app) - self._runner = web.AppRunner(app) - await self._runner.setup() - site = web.TCPSite(self._runner, self._host, self._port) - await site.start() + # Shared-listener mode (multiplex secondary): no bind; served at /p//. + from gateway.platforms.shared_ingress import bind_listener + self._runner = await bind_listener(self, app, self._host, self._port, self._webhook_path) self._mark_connected() - logger.info("[msgraph_webhook] Listening on %s:%d%s", self._host, self._port, self._webhook_path) + if self._runner is not None: + logger.info("[msgraph_webhook] Listening on %s:%d%s", self._host, self._port, self._webhook_path) return True async def disconnect(self) -> None: diff --git a/gateway/platforms/whatsapp_cloud.py b/gateway/platforms/whatsapp_cloud.py index a88762c2b8..016bdd3512 100644 --- a/gateway/platforms/whatsapp_cloud.py +++ b/gateway/platforms/whatsapp_cloud.py @@ -270,14 +270,15 @@ class WhatsAppCloudAdapter(WhatsAppBehaviorMixin, BasePlatformAdapter): app.router.add_get(self._health_path, self._handle_health) app.router.add_get(self._webhook_path, self._handle_verify) app.router.add_post(self._webhook_path, self._handle_webhook) - self._runner = web.AppRunner(app) - await self._runner.setup() - await web.TCPSite(self._runner, self._webhook_host, self._webhook_port).start() + # Shared-listener mode (multiplex secondary): no bind; served at /p//. + from gateway.platforms.shared_ingress import bind_listener + self._runner = await bind_listener(self, app, self._webhook_host, self._webhook_port, self._webhook_path) self._mark_connected() - logger.info( - "[whatsapp_cloud] Listening on %s:%d%s (Graph %s, phone_id=%s)", - self._webhook_host, self._webhook_port, self._webhook_path, self._api_version, self._phone_number_id, - ) + if self._runner is not None: + logger.info( + "[whatsapp_cloud] Listening on %s:%d%s (Graph %s, phone_id=%s)", + self._webhook_host, self._webhook_port, self._webhook_path, self._api_version, self._phone_number_id, + ) if not self._verify_token: logger.warning("[whatsapp_cloud] WHATSAPP_CLOUD_VERIFY_TOKEN is not set — the GET subscription handshake will fail until it is.") if not self._app_secret: diff --git a/plugins/platforms/feishu/adapter.py b/plugins/platforms/feishu/adapter.py index 3f8949be1e..4f8ff5d22a 100644 --- a/plugins/platforms/feishu/adapter.py +++ b/plugins/platforms/feishu/adapter.py @@ -3737,10 +3737,9 @@ class FeishuAdapter(BasePlatformAdapter): # See #58536, #58902, #59180. app = web.Application(client_max_size=_FEISHU_WEBHOOK_MAX_BODY_BYTES) app.router.add_post(self._webhook_path, self._handle_webhook_request) - self._webhook_runner = web.AppRunner(app) - await self._webhook_runner.setup() - self._webhook_site = web.TCPSite(self._webhook_runner, self._webhook_host, self._webhook_port) - await self._webhook_site.start() + # Shared-listener mode (multiplex secondary): no bind; served at /p//. + from gateway.platforms.shared_ingress import bind_listener + self._webhook_runner = await bind_listener(self, app, self._webhook_host, self._webhook_port, self._webhook_path) def _prepare_client(self) -> Any: """Build the lark client + event dispatcher for this adapter's domain; returns the SDK domain.""" diff --git a/plugins/platforms/line/adapter.py b/plugins/platforms/line/adapter.py index 528ba1b984..1a2807d56d 100644 --- a/plugins/platforms/line/adapter.py +++ b/plugins/platforms/line/adapter.py @@ -461,15 +461,14 @@ class LineAdapter(BasePlatformAdapter): self._app.router.add_get(f"{DEFAULT_MEDIA_PATH_PREFIX}/{{token}}/{{filename}}", self._handle_media) # Plugin-registered routes must be wired before AppRunner.setup() freezes the router. self._wire_plugin_handlers(self._app) - self._runner = web.AppRunner(self._app) + from gateway.platforms.shared_ingress import bind_listener try: - await self._runner.setup() # SO_REUSEADDR: on macOS/BSD two sockets with it can silently split traffic → # disable; on Linux it only allows rebinding past TIME_WAIT → keep default. - self._site = web.TCPSite( - self._runner, self.webhook_host, self.webhook_port, + # Shared-listener mode (multiplex secondary): no bind; served at /p//line/webhook. + self._runner = await bind_listener( + self, self._app, self.webhook_host, self.webhook_port, self.webhook_path, reuse_address=False if sys.platform == "darwin" else None) - await self._site.start() except OSError as exc: return self._fail( "bind_failed", @@ -477,12 +476,13 @@ class LineAdapter(BasePlatformAdapter): f"{self.webhook_port}: {exc}", retryable=True) self._mark_connected() - logger.info( - "LINE: webhook listening on %s:%s%s%s", - self.webhook_host or "* (all interfaces, IPv4+IPv6)", - self.webhook_port, - self.webhook_path, - f" (public: {self.public_base_url})" if self.public_base_url else "") + if self._runner is not None: + logger.info( + "LINE: webhook listening on %s:%s%s%s", + self.webhook_host or "* (all interfaces, IPv4+IPv6)", + self.webhook_port, + self.webhook_path, + f" (public: {self.public_base_url})" if self.public_base_url else "") return True async def disconnect(self) -> None: @@ -765,6 +765,8 @@ class LineAdapter(BasePlatformAdapter): def _media_url(self, token: str, filename: str) -> str: if self.public_base_url: base = self.public_base_url + elif getattr(self, "_shared_ingress_base", None): + base = self._shared_ingress_base # default listener's /p/ prefix (multiplex secondary) else: # Wildcard/dual-stack binds have no fetchable hostname (the _missing_public_url # guard should have fired); fall back to localhost so the URL is well-formed. @@ -777,7 +779,9 @@ class LineAdapter(BasePlatformAdapter): def _missing_public_url(self) -> bool: """True when no LINE_PUBLIC_URL is set and the bind host is wildcard/dual-stack ``None``.""" - return not self.public_base_url and (self.webhook_host is None or self.webhook_host in _WILDCARD_HOSTS) + if self.public_base_url or getattr(self, "_shared_ingress_base", None): + return False + return self.webhook_host is None or self.webhook_host in _WILDCARD_HOSTS def _check_media_file(self, kind: str, file_path: str) -> Tuple[Optional[Path], Optional[SendResult]]: """Shared preflight for send_image_file/send_voice/send_video → ``(path, error)``.""" diff --git a/plugins/platforms/sms/adapter.py b/plugins/platforms/sms/adapter.py index 12b41f3a98..0b3c000deb 100644 --- a/plugins/platforms/sms/adapter.py +++ b/plugins/platforms/sms/adapter.py @@ -129,15 +129,15 @@ class SmsAdapter(BasePlatformAdapter): app = web.Application(client_max_size=_TWILIO_WEBHOOK_MAX_BODY_BYTES) app.router.add_post("/webhooks/twilio", self._handle_webhook) app.router.add_get("/health", lambda _: web.Response(text="ok")) - self._runner = web.AppRunner(app) - await self._runner.setup() - site = web.TCPSite(self._runner, self._webhook_host, self._webhook_port) - await site.start() + # Shared-listener mode (multiplex secondary): no bind; served at /p//webhooks/twilio. + from gateway.platforms.shared_ingress import bind_listener + self._runner = await bind_listener(self, app, self._webhook_host, self._webhook_port, "/webhooks/twilio") self._http_session = _new_session(trust_env=gateway_trust_env()) self._running = True - logger.info( - "[sms] Twilio webhook server listening on %s:%d, from: %s", - self._webhook_host, self._webhook_port, redact_phone(self._from_number)) + if self._runner is not None: + logger.info( + "[sms] Twilio webhook server listening on %s:%d, from: %s", + self._webhook_host, self._webhook_port, redact_phone(self._from_number)) self._wire_plugin_handlers(None) return True diff --git a/plugins/platforms/teams/adapter.py b/plugins/platforms/teams/adapter.py index ab1e540b37..95dbddd1c8 100644 --- a/plugins/platforms/teams/adapter.py +++ b/plugins/platforms/teams/adapter.py @@ -401,15 +401,15 @@ class TeamsAdapter(BasePlatformAdapter): self._wire_plugin_handlers(self._app) await self._app.initialize() - self._runner = web.AppRunner(aiohttp_app) - await self._runner.setup() - site = web.TCPSite(self._runner, self._host, self._port) - await site.start() + # Shared-listener mode (multiplex secondary): no bind; served at /p//api/messages. + from gateway.platforms.shared_ingress import bind_listener + self._runner = await bind_listener(self, aiohttp_app, self._host, self._port, _WEBHOOK_PATH) self._running = True self._mark_connected() - logger.info( - "[teams] Webhook server listening on %s:%d%s", - self._host or "* (all interfaces, IPv4+IPv6)", self._port, _WEBHOOK_PATH) + if self._runner is not None: + logger.info( + "[teams] Webhook server listening on %s:%d%s", + self._host or "* (all interfaces, IPv4+IPv6)", self._port, _WEBHOOK_PATH) return True except Exception as e: self._set_fatal_error("CONNECT_FAILED", f"Teams connection failed: {e}", retryable=True) diff --git a/plugins/platforms/wecom/callback_adapter.py b/plugins/platforms/wecom/callback_adapter.py index 6fd03e05cd..871f35375e 100644 --- a/plugins/platforms/wecom/callback_adapter.py +++ b/plugins/platforms/wecom/callback_adapter.py @@ -117,14 +117,16 @@ class WecomCallbackAdapter(BasePlatformAdapter): if not check_wecom_callback_requirements(): logger.warning("[WecomCallback] aiohttp/httpx not installed") return False - try: # quick port-in-use check - with _socket.socket(_socket.AF_INET, _socket.SOCK_STREAM) as sock: - sock.settimeout(1) - sock.connect(("127.0.0.1", self._port)) - logger.error("[WecomCallback] Port %d already in use", self._port) - return False - except (ConnectionRefusedError, OSError): - pass + from gateway.platforms.shared_ingress import bind_listener, shared_ingress_profile + if not shared_ingress_profile(self): + try: # quick port-in-use check + with _socket.socket(_socket.AF_INET, _socket.SOCK_STREAM) as sock: + sock.settimeout(1) + sock.connect(("127.0.0.1", self._port)) + logger.error("[WecomCallback] Port %d already in use", self._port) + return False + except (ConnectionRefusedError, OSError): + pass try: # Tighter keepalive so idle CLOSE_WAIT drains promptly (#18451). from gateway.platforms._http_client_limits import platform_httpx_limits @@ -134,13 +136,12 @@ class WecomCallbackAdapter(BasePlatformAdapter): self._app.router.add_get("/health", self._handle_health) self._app.router.add_get(self._path, self._handle_verify) self._app.router.add_post(self._path, self._handle_callback) - self._runner = web.AppRunner(self._app) - await self._runner.setup() - self._site = web.TCPSite(self._runner, self._host, self._port) - await self._site.start() + # Shared-listener mode (multiplex secondary): no bind; served at /p//. + self._runner = await bind_listener(self, self._app, self._host, self._port, self._path) self._poll_task = asyncio.create_task(self._poll_loop()) self._mark_connected() - logger.info("[WecomCallback] HTTP server listening on %s:%s%s", self._host, self._port, self._path) + if self._runner is not None: + logger.info("[WecomCallback] HTTP server listening on %s:%s%s", self._host, self._port, self._path) for app in self._apps: try: await self._refresh_access_token(app)