aury-boot 0.0.43__py3-none-any.whl → 0.0.44__py3-none-any.whl

aury/boot/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.43'
-__version_tuple__ = version_tuple = (0, 0, 43)
+__version__ = version = '0.0.44'
+__version_tuple__ = version_tuple = (0, 0, 44)
 
 __commit_id__ = commit_id = None

aury/boot/infrastructure/cache/redis.py

@@ -96,58 +96,31 @@ class RedisCache(ICache):
         self._is_cluster = False
     
     async def _init_cluster(self) -> None:
-        """初始化 Redis Cluster（使用 coredis）。
+        """初始化 Redis Cluster（使用 redis-py）。
         
         支持 URL 格式:
         - redis-cluster://password@host:port （密码在用户名位置）
         - redis-cluster://:password@host:port （标准格式）
         - redis-cluster://username:password@host:port （ACL 模式）
         """
-        try:
-            from coredis import RedisCluster
-            from coredis.retry import ConstantRetryPolicy
-            from coredis.exceptions import ConnectionError as CoredisConnectionError
-        except ImportError as exc:
-            raise ImportError(
-                "Redis Cluster 需要安装 coredis: pip install coredis"
-            ) from exc
-        
-        # 解析 URL
-        parsed_url = self._url.replace("redis-cluster://", "redis://")
-        parsed = urlparse(parsed_url)
+        from redis.asyncio.cluster import RedisCluster
         
-        # 提取认证信息
-        username = parsed.username
-        password = parsed.password
+        # 转换 URL scheme
+        redis_url = self._url.replace("redis-cluster://", "redis://")
         
-        # 处理 password@host 格式
-        if username and not password:
-            password = username
-            username = None
+        # 处理 password@host 格式（转换为标准 :password@host 格式）
+        parsed = urlparse(redis_url)
+        if parsed.username and not parsed.password:
+            # redis://password@host -> redis://:password@host
+            redis_url = redis_url.replace(
+                f"redis://{parsed.username}@",
+                f"redis://:{parsed.username}@"
+            )
         
-        # 配置更快的重试策略
-        retry_policy = ConstantRetryPolicy(
-            retries=3,
-            delay=1,
-            retryable_exceptions=(CoredisConnectionError, TimeoutError, OSError),
+        self._redis = RedisCluster.from_url(
+            redis_url,
+            decode_responses=False,
         )
-        
-        # 构建连接参数
-        cluster_kwargs: dict = {
-            "host": parsed.hostname or "localhost",
-            "port": parsed.port or 6379,
-            "decode_responses": False,
-            "connect_timeout": 5,
-            "stream_timeout": 5,
-            "retry_policy": retry_policy,
-        }
-        
-        if username:
-            cluster_kwargs["username"] = username
-        if password:
-            cluster_kwargs["password"] = password
-        
-        self._redis = RedisCluster(**cluster_kwargs)
         self._is_cluster = True
     
     async def get(self, key: str, default: Any = None) -> Any:
@@ -266,8 +239,11 @@ class RedisCache(ICache):
     async def close(self) -> None:
         """关闭连接（仅当自己拥有连接时）。"""
         if self._redis and self._owns_connection:
-            # coredis 和 redis-py 都使用 close() 方法
-            await self._redis.close()
+            if self._is_cluster:
+                # redis-py cluster 使用 aclose()
+                await self._redis.aclose()
+            else:
+                await self._redis.close()
             logger.info("Redis连接已关闭")
         self._redis = None
     

aury/boot/infrastructure/channel/__init__.py

@@ -5,11 +5,12 @@
 支持的后端（通过 Broadcaster 库）:
 - memory:// - 内存通道（单进程，开发/测试用）
 - redis:// - Redis Pub/Sub（多进程/分布式）
+- redis-cluster:// - Redis Cluster（自动转换为普通 Pub/Sub）
 - kafka:// - Apache Kafka
 - postgres:// - PostgreSQL LISTEN/NOTIFY
 """
 
-from .backends import BroadcasterChannel, RedisClusterChannel
+from .backends import BroadcasterChannel
 from .base import ChannelBackend, ChannelMessage, IChannel
 from .manager import ChannelManager
 
@@ -22,5 +23,4 @@ __all__ = [
     "ChannelManager",
     # 后端实现
     "BroadcasterChannel",
-    "RedisClusterChannel",
 ]

aury/boot/infrastructure/channel/backends/__init__.py

@@ -1,6 +1,5 @@
 """通道后端实现。"""
 
 from .broadcaster import BroadcasterChannel
-from .redis_cluster_channel import RedisClusterChannel
 
-__all__ = ["BroadcasterChannel", "RedisClusterChannel"]
+__all__ = ["BroadcasterChannel"]

aury/boot/infrastructure/channel/base.py

@@ -16,10 +16,8 @@ from typing import Any
 class ChannelBackend(Enum):
     """通道后端类型。"""
 
-    # Broadcaster 统一后端（支持 memory/redis/kafka/postgres，通过 URL scheme 区分）
+    # Broadcaster 统一后端（支持 memory/redis/redis-cluster/kafka/postgres，通过 URL scheme 区分）
     BROADCASTER = "broadcaster"
-    # Redis Cluster + Sharded Pub/Sub (Redis 7.0+)，使用 coredis 库
-    REDIS_CLUSTER = "redis_cluster"
     # 未来扩展
     RABBITMQ = "rabbitmq"
     ROCKETMQ = "rocketmq"

aury/boot/infrastructure/channel/manager.py

@@ -10,7 +10,6 @@ from collections.abc import AsyncIterator
 from aury.boot.common.logging import logger
 
 from .backends.broadcaster import BroadcasterChannel
-from .backends.redis_cluster_channel import RedisClusterChannel
 from .base import ChannelBackend, ChannelMessage, IChannel
 
 
@@ -94,7 +93,7 @@ class ChannelManager:
             url: 连接 URL，支持：
                 - memory:// - 内存后端（单进程，默认）
                 - redis://host:port/db - Redis Pub/Sub
-                - redis-cluster://[password@]host:port - Redis Cluster (Sharded Pub/Sub)
+                - redis-cluster://[password@]host:port - Redis Cluster (普通 Pub/Sub)
                 - kafka://host:port - Apache Kafka
                 - postgres://user:pass@host/db - PostgreSQL
 
@@ -109,17 +108,18 @@ class ChannelManager:
         if isinstance(backend, str):
             backend = ChannelBackend(backend.lower())
         
-        # 自动检测 redis-cluster:// scheme
+        # redis-cluster:// 转换为 redis://，使用 broadcaster 的普通 Pub/Sub
+        # 普通 Pub/Sub 在 Redis Cluster 中会自动广播到所有节点
+        broadcast_url = url
         if url.startswith("redis-cluster://"):
-            backend = ChannelBackend.REDIS_CLUSTER
+            broadcast_url = url.replace("redis-cluster://", "redis://")
+            logger.info(f"通道管理器 [{self.name}] Redis Cluster 使用普通 Pub/Sub 模式")
 
         self._backend_type = backend
         self._url = url
 
-        if backend == ChannelBackend.BROADCASTER:
-            self._backend = BroadcasterChannel(url)
-        elif backend == ChannelBackend.REDIS_CLUSTER:
-            self._backend = RedisClusterChannel(url)
+        if backend == ChannelBackend.BROADCASTER or url.startswith("redis-cluster://"):
+            self._backend = BroadcasterChannel(broadcast_url)
         elif backend in (ChannelBackend.RABBITMQ, ChannelBackend.ROCKETMQ):
             raise NotImplementedError(f"{backend.value} 后端暂未实现")
         else:

aury/boot/infrastructure/clients/redis/manager.py

@@ -202,58 +202,30 @@ class RedisClient:
         self._is_cluster = False
     
     async def _initialize_cluster(self, url: str) -> None:
-        """初始化 Redis Cluster 连接（使用 coredis）。
+        """初始化 Redis Cluster 连接（使用 redis-py）。
         
         支持 URL 格式:
         - redis-cluster://password@host:port （密码在用户名位置）
         - redis-cluster://:password@host:port （标准格式）
         - redis-cluster://username:password@host:port （ACL 模式）
         """
-        try:
-            from coredis import RedisCluster
-            from coredis.retry import ConstantRetryPolicy
-            from coredis.exceptions import ConnectionError as CoredisConnectionError
-        except ImportError as exc:
-            raise ImportError(
-                "Redis Cluster 需要安装 coredis: pip install coredis"
-            ) from exc
-        
-        # 解析 URL
-        parsed_url = url.replace("redis-cluster://", "redis://")
-        parsed = urlparse(parsed_url)
+        from redis.asyncio.cluster import RedisCluster
         
-        # 提取认证信息
-        username = parsed.username
-        password = parsed.password
+        # 转换 URL scheme
+        redis_url = url.replace("redis-cluster://", "redis://")
         
-        # 处理 password@host 格式
-        if username and not password:
-            password = username
-            username = None
+        # 处理 password@host 格式（转换为标准 :password@host 格式）
+        parsed = urlparse(redis_url)
+        if parsed.username and not parsed.password:
+            redis_url = redis_url.replace(
+                f"redis://{parsed.username}@",
+                f"redis://:{parsed.username}@"
+            )
         
-        # 配置更快的重试策略（默认间隔太长）
-        retry_policy = ConstantRetryPolicy(
-            retries=3,
-            delay=1,  # 1 秒重试间隔
-            retryable_exceptions=(CoredisConnectionError, TimeoutError, OSError),
+        self._redis = RedisCluster.from_url(
+            redis_url,
+            decode_responses=self._config.decode_responses,
         )
-        
-        # 构建连接参数
-        cluster_kwargs: dict = {
-            "host": parsed.hostname or "localhost",
-            "port": parsed.port or 6379,
-            "decode_responses": self._config.decode_responses,
-            "connect_timeout": self._config.socket_connect_timeout or 5,
-            "stream_timeout": self._config.socket_timeout or 5,
-            "retry_policy": retry_policy,
-        }
-        
-        if username:
-            cluster_kwargs["username"] = username
-        if password:
-            cluster_kwargs["password"] = password
-        
-        self._redis = RedisCluster(**cluster_kwargs)
         self._is_cluster = True
     
     def _mask_url(self, url: str) -> str:
@@ -328,8 +300,8 @@ class RedisClient:
         """清理资源，关闭连接。"""
         if self._redis:
             if self._is_cluster:
-                # coredis 使用 close() 方法
-                await self._redis.close()
+                # redis-py cluster 使用 aclose()
+                await self._redis.aclose()
             else:
                 await self._redis.close()
             logger.info(f"Redis 客户端 [{self.name}] 已关闭")

aury/boot/infrastructure/mq/backends/redis_stream.py

@@ -309,23 +309,12 @@ class RedisStreamMQ(IMQ):
         await self._ensure_client()
         stream_key = self._stream_key(queue)
         
-        # coredis 使用 start/end，redis-py 使用 min/max
-        if hasattr(self._client, 'is_cluster') and self._client.is_cluster:
-            # coredis API
-            result = await self._client.connection.xrange(
-                stream_key,
-                start=start,
-                end=end,
-                count=count,
-            )
-        else:
-            # redis-py API
-            result = await self._client.connection.xrange(
-                stream_key,
-                min=start,
-                max=end,
-                count=count,
-            )
+        result = await self._client.connection.xrange(
+            stream_key,
+            min=start,
+            max=end,
+            count=count,
+        )
         
         messages = []
         for msg_id, data in result:

{aury_boot-0.0.43.dist-info → aury_boot-0.0.44.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aury-boot
-Version: 0.0.43
+Version: 0.0.44
 Summary: Aury Boot - 基于 FastAPI 生态的企业级 API 开发框架
 Requires-Python: >=3.13
 Requires-Dist: aiohttp>=3.11.0
@@ -28,7 +28,6 @@ Requires-Dist: aiosqlite>=0.21.0; extra == 'all'
 Requires-Dist: apscheduler>=3.11.1; extra == 'all'
 Requires-Dist: asyncpg>=0.31.0; extra == 'all'
 Requires-Dist: aury-sdk-storage[aws]>=0.0.1; extra == 'all'
-Requires-Dist: coredis>=5.6.0; extra == 'all'
 Requires-Dist: dramatiq>=1.18.0; extra == 'all'
 Requires-Dist: pika>=1.3.2; extra == 'all'
 Requires-Dist: psutil>=7.0.0; extra == 'all'
@@ -36,8 +35,6 @@ Requires-Dist: pyroscope-io>=0.8.7; extra == 'all'
 Requires-Dist: redis>=7.1.0; extra == 'all'
 Provides-Extra: broadcaster
 Requires-Dist: broadcaster[redis]>=0.3.1; extra == 'broadcaster'
-Provides-Extra: channel-cluster
-Requires-Dist: coredis>=5.6.0; extra == 'channel-cluster'
 Provides-Extra: dev
 Requires-Dist: httpx>=0.28.1; extra == 'dev'
 Requires-Dist: mypy>=1.19.0; extra == 'dev'
@@ -71,7 +68,6 @@ Requires-Dist: aiosqlite>=0.21.0; extra == 'recommended'
 Requires-Dist: apscheduler>=3.11.1; extra == 'recommended'
 Requires-Dist: asyncpg>=0.31.0; extra == 'recommended'
 Requires-Dist: aury-sdk-storage[aws]>=0.0.1; extra == 'recommended'
-Requires-Dist: coredis>=5.6.0; extra == 'recommended'
 Requires-Dist: dramatiq>=1.18.0; extra == 'recommended'
 Requires-Dist: opentelemetry-api>=1.25.0; extra == 'recommended'
 Requires-Dist: opentelemetry-instrumentation-aiohttp-client>=0.46b0; extra == 'recommended'

{aury_boot-0.0.43.dist-info → aury_boot-0.0.44.dist-info}/RECORD

@@ -1,5 +1,5 @@
 aury/boot/__init__.py,sha256=pCno-EInnpIBa1OtxNYF-JWf9j95Cd2h6vmu0xqa_-4,1791
-aury/boot/_version.py,sha256=qJphZkKjg5qeGMzBrtqKwyJZQtcx3oaEh-0t6ejMuVo,706
+aury/boot/_version.py,sha256=Zrt00MLeXbWP2ZsKSWktjZjWuHHC_-KLVmAWLgE0o-g,706
 aury/boot/application/__init__.py,sha256=I2KqNVdYg2q5nlOXr0TtFGyHmhj4oWdaR6ZB73Mwg7Y,3041
 aury/boot/application/adapter/__init__.py,sha256=e1bcSb1bxUMfofTwiCuHBZJk5-STkMCWPF2EJXHQ7UU,3976
 aury/boot/application/adapter/base.py,sha256=Ar_66fiHPDEmV-1DKnqXKwc53p3pozG31bgTJTEUriY,15763
@@ -143,21 +143,19 @@ aury/boot/infrastructure/cache/exceptions.py,sha256=KZsFIHXW3_kOh_KB93EVZJKbiDvD
 aury/boot/infrastructure/cache/factory.py,sha256=aF74JoiiSKFgctqqh2Z8OtGRS2Am_ou-I40GyygLzC0,2489
 aury/boot/infrastructure/cache/manager.py,sha256=2jlshbO4NqpPxH-8DBiMFNAvWuZUI3atUCsw9GGlzc8,16807
 aury/boot/infrastructure/cache/memory.py,sha256=qGhLKKjGsEUHjVRFMV6A33MB_1iPaKCEEkT6VFrLkQY,9832
-aury/boot/infrastructure/cache/redis.py,sha256=OeLrjQ8jooJLItTr5xtgoxpb6WPw-HN3JpGNPQDvINA,10964
-aury/boot/infrastructure/channel/__init__.py,sha256=zv3dNH4By8h-5Fksi18LFJVf5cXBmj0M49DjTfQL2w4,712
-aury/boot/infrastructure/channel/base.py,sha256=xE_7vtgSB06PIq6HPh59MXXisjBuz530NmlnMwQxU5Q,3049
-aury/boot/infrastructure/channel/manager.py,sha256=pTXhWTjRh83ifX9bKlsD4t5w1pZQOZszGbiy4wBYfJ8,7906
-aury/boot/infrastructure/channel/backends/__init__.py,sha256=qRA8JuAueQXRfcqJSl-M2a1sRNscPjCQBgVmWn3DFu4,185
+aury/boot/infrastructure/cache/redis.py,sha256=OtjDRVSGI3WFrURTEVa-2NabZMPywjKTeZuNDjloN1I,10213
+aury/boot/infrastructure/channel/__init__.py,sha256=gl0PNOEfomiuVh5KLwJKoc3r_vnQsoXKHuwJBffgfMY,734
+aury/boot/infrastructure/channel/base.py,sha256=Us1sqa6__XUXPNaI_Fd8beznEyGu8ezkLZBjqIix5HQ,2955
+aury/boot/infrastructure/channel/manager.py,sha256=BmWmd4h7451JbdoJy4p0SRrSTpzIbNpqVAGATxxlzfI,8046
+aury/boot/infrastructure/channel/backends/__init__.py,sha256=NcXG8_KAqy1SiGUs2z_KvkS90jMfLJ6bzyYK4Jw4qCg,107
 aury/boot/infrastructure/channel/backends/broadcaster.py,sha256=y8eKx6X6Iy9a_5vnLMm5gjqkq05SmJEWESw1-x0lIFg,4771
-aury/boot/infrastructure/channel/backends/redis_cluster.py,sha256=KtPB0nHK76tyVFiD2Rs_LPbjyw0R-9CwM0R-xcy9cTY,4579
-aury/boot/infrastructure/channel/backends/redis_cluster_channel.py,sha256=MAlo1mnyQzjhK1FwxeTiMvz_RpFjVuH3AgKKhAcH8Rs,4949
 aury/boot/infrastructure/clients/__init__.py,sha256=1ANMejb3RrBgaR-jq-dsxJ0kQDRHz5jV-QvdUNcf_ok,435
 aury/boot/infrastructure/clients/rabbitmq/__init__.py,sha256=cnU-W7jOcAgp_FvsY9EipNCeJzeA9gHLRuZ0yQZE2DI,200
 aury/boot/infrastructure/clients/rabbitmq/config.py,sha256=YmvNiISpqNt-LE2CrpzmxCgaEgYna7IbOfUSnA0B4T0,1239
 aury/boot/infrastructure/clients/rabbitmq/manager.py,sha256=a3Op0yN2DICnoqxOVb0DVT9RnoF8laN2EutOsOSWzWA,9659
 aury/boot/infrastructure/clients/redis/__init__.py,sha256=HGZVfcWmOPeiAk-rJ8Yun7N5CQiPlGFofdByvl8Uqso,613
 aury/boot/infrastructure/clients/redis/config.py,sha256=KfC2R7bcQ91zjTp8Q_S7j3ZemDLdejUYc3CrWsJlpNM,1421
-aury/boot/infrastructure/clients/redis/manager.py,sha256=b8x-SD8wS_YSCjneS_63rCzRZOmojqxKiV0zpdjTJ4U,11697
+aury/boot/infrastructure/clients/redis/manager.py,sha256=MT-a_3wIw7DSPWyAs_G8WT1UpoVGN-_G8iyN7It8rbE,10684
 aury/boot/infrastructure/database/__init__.py,sha256=MsHNyrJ2CZJT-lbVZzOAJ0nFfFEmHrJqC0zw-cFS768,888
 aury/boot/infrastructure/database/config.py,sha256=5LYy4DuLL0XNjVnX2HUcrMh3c71eeZa-vWGM8QCkL0U,1408
 aury/boot/infrastructure/database/exceptions.py,sha256=hUjsU23c0eMwogSDrKq_bQ6zvnY7PQSGaitbCEhhDZQ,766
@@ -197,7 +195,7 @@ aury/boot/infrastructure/mq/manager.py,sha256=Bu4E1Tgz0CzFvJuCS9_fBMj9eAqmXcZp8a
 aury/boot/infrastructure/mq/backends/__init__.py,sha256=10nggw2V-AzuZ1vvzq_ksoXR4FI3e4BR36EfY49Pek4,200
 aury/boot/infrastructure/mq/backends/rabbitmq.py,sha256=0NWgPKEwtbmI63EVvKINdfXXDNyOvuOOP9LlBzqH91E,5493
 aury/boot/infrastructure/mq/backends/redis.py,sha256=B89U7mqIceUsCXE4G3u1u6aFM9hv4mmLLwuCYq1T9tQ,5281
-aury/boot/infrastructure/mq/backends/redis_stream.py,sha256=IAw-sn87uIV9YI65WaHF5dCTNdQd3hKWFcZI4AUCNvk,15173
+aury/boot/infrastructure/mq/backends/redis_stream.py,sha256=p2WTj10-zbxQ_2NPU97w-n4DZ8KSHhLjqcnplLPCw4U,14761
 aury/boot/infrastructure/scheduler/__init__.py,sha256=ji_K1OePMHt4CIFr168LGEbSuX8ybgrden-W75b0NdI,395
 aury/boot/infrastructure/scheduler/exceptions.py,sha256=ROltrhSctVWA-6ulnjuYeHAk3ZF-sykDoesuierYzew,634
 aury/boot/infrastructure/scheduler/manager.py,sha256=wUxMRGXpoAwjHnB4u7BKnzJbiPZE5sovuLPrgLoQYb4,23753
@@ -218,7 +216,7 @@ aury/boot/testing/client.py,sha256=KOg1EemuIVsBG68G5y0DjSxZGcIQVdWQ4ASaHE3o1R0,4
 aury/boot/testing/factory.py,sha256=8GvwX9qIDu0L65gzJMlrWB0xbmJ-7zPHuwk3eECULcg,5185
 aury/boot/toolkit/__init__.py,sha256=AcyVb9fDf3CaEmJPNkWC4iGv32qCPyk4BuFKSuNiJRQ,334
 aury/boot/toolkit/http/__init__.py,sha256=5bv4Ntz1sbNFhP9zPLBDhB536ZX1CKIAOp-kQSKMRQ0,14161
-aury_boot-0.0.43.dist-info/METADATA,sha256=WJz98j7foEbb61Ih5wMbApuApunDPlfEPiMjwNyBAvU,9179
-aury_boot-0.0.43.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-aury_boot-0.0.43.dist-info/entry_points.txt,sha256=f9KXEkDIGc0BGkgBvsNx_HMz9VhDjNxu26q00jUpDwQ,49
-aury_boot-0.0.43.dist-info/RECORD,,
+aury_boot-0.0.44.dist-info/METADATA,sha256=bfqYiQIMM0PCiv8FBeYWG_E-7MnPapRsErR0wu0TNP0,8989
+aury_boot-0.0.44.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+aury_boot-0.0.44.dist-info/entry_points.txt,sha256=f9KXEkDIGc0BGkgBvsNx_HMz9VhDjNxu26q00jUpDwQ,49
+aury_boot-0.0.44.dist-info/RECORD,,

aury/boot/infrastructure/channel/backends/redis_cluster.py

@@ -1,136 +0,0 @@
-"""Redis Cluster 通道后端。
-
-使用 coredis 库支持异步 Redis Cluster Sharded Pub/Sub (Redis 7.0+)。
-
-URL 格式：
-    redis-cluster://password@host:port
-    redis-cluster://host:port
-"""
-
-from __future__ import annotations
-
-import asyncio
-from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any
-from urllib.parse import urlparse
-
-from aury.boot.common.logging import logger
-
-try:
-    from coredis import RedisCluster
-    from coredis.retry import ConstantRetryPolicy
-    from coredis.exceptions import ConnectionError as CoredisConnectionError
-except ImportError as exc:
-    raise ImportError(
-        "Redis Cluster Channel 需要安装 coredis: pip install coredis"
-    ) from exc
-
-
-@dataclass
-class Event:
-    """与 broadcaster._base.Event 兼容的事件类。"""
-    channel: str
-    message: str
-
-
-class RedisClusterBackend:
-    """Redis Cluster Pub/Sub 后端。
-    
-    使用 coredis 库的 sharded_pubsub() 支持 Sharded Pub/Sub。
-    与 broadcaster.RedisBackend 接口兼容。
-    """
-
-    def __init__(self, url: str) -> None:
-        host, port, password = self._parse_url(url)
-        
-        # 配置更快的重试策略
-        retry_policy = ConstantRetryPolicy(
-            retries=3,
-            delay=1,
-            retryable_exceptions=(CoredisConnectionError, TimeoutError, OSError),
-        )
-        
-        self._client: RedisCluster = RedisCluster(
-            host=host,
-            port=port,
-            password=password,
-            decode_responses=True,
-            connect_timeout=5,
-            stream_timeout=5,
-            retry_policy=retry_policy,
-        )
-        self._pubsub: Any = None
-        self._queue: asyncio.Queue[Event] = asyncio.Queue()
-        self._listener_task: asyncio.Task | None = None
-        self._subscribed_channels: set[str] = set()
-
-    def _parse_url(self, url: str) -> tuple[str, int, str | None]:
-        """解析 URL。"""
-        url = url.replace("redis-cluster://", "redis://")
-        parsed = urlparse(url)
-        password = parsed.password
-        # 支持 password@host 格式
-        if not password and parsed.username:
-            password = parsed.username
-        return parsed.hostname or "localhost", parsed.port or 6379, password
-
-    async def connect(self) -> None:
-        """连接并初始化 pubsub。"""
-        # coredis 的 sharded_pubsub() 支持 Redis 7.0+ Sharded Pub/Sub
-        self._pubsub = self._client.sharded_pubsub()
-        self._listener_task = asyncio.create_task(self._listen_loop())
-        logger.debug("Redis Cluster Channel 已连接")
-
-    async def disconnect(self) -> None:
-        """断开连接。"""
-        if self._listener_task:
-            self._listener_task.cancel()
-            try:
-                await self._listener_task
-            except asyncio.CancelledError:
-                pass
-        if self._pubsub:
-            await self._pubsub.sunsubscribe()
-        await self._client.close()
-        logger.debug("Redis Cluster Channel 已断开")
-
-    async def subscribe(self, channel: str) -> None:
-        """订阅频道。"""
-        if self._pubsub:
-            await self._pubsub.ssubscribe(channel)
-            self._subscribed_channels.add(channel)
-
-    async def unsubscribe(self, channel: str) -> None:
-        """取消订阅。"""
-        if self._pubsub and channel in self._subscribed_channels:
-            await self._pubsub.sunsubscribe(channel)
-            self._subscribed_channels.discard(channel)
-
-    async def publish(self, channel: str, message: str) -> None:
-        """发布消息（使用 SPUBLISH）。"""
-        await self._client.spublish(channel, message)
-
-    async def next_published(self) -> Event:
-        """获取下一条消息。"""
-        return await self._queue.get()
-
-    async def _listen_loop(self) -> None:
-        """监听消息循环。"""
-        while True:
-            try:
-                if self._pubsub:
-                    async for message in self._pubsub:
-                        if message and message.get("type") in ("message", "smessage"):
-                            event = Event(
-                                channel=message.get("channel", ""),
-                                message=message.get("data", ""),
-                            )
-                            await self._queue.put(event)
-            except asyncio.CancelledError:
-                break
-            except Exception as e:
-                logger.warning(f"Redis Cluster pubsub error: {e}")
-                await asyncio.sleep(1)
-
-
-__all__ = ["RedisClusterBackend"]

aury/boot/infrastructure/channel/backends/redis_cluster_channel.py

@@ -1,139 +0,0 @@
-"""Redis Cluster 通道封装。
-
-使用 RedisClusterBackend，提供与 BroadcasterChannel 一致的接口。
-"""
-
-from __future__ import annotations
-
-import json
-from collections.abc import AsyncIterator
-from datetime import datetime
-
-from aury.boot.common.logging import logger
-
-from ..base import ChannelMessage, IChannel
-from .redis_cluster import RedisClusterBackend
-
-
-class RedisClusterChannel(IChannel):
-    """Redis Cluster 通道实现。
-    
-    使用 broadcaster 架构：共享连接 + Queue 分发。
-    支持 Sharded Pub/Sub (Redis 7.0+)。
-    """
-
-    def __init__(self, url: str) -> None:
-        """初始化 Redis Cluster 通道。
-
-        Args:
-            url: redis-cluster://[password@]host:port
-        """
-        self._url = url
-        self._backend = RedisClusterBackend(url)
-        self._connected = False
-        # 订阅者管理（与 broadcaster 相同的模式）
-        self._subscribers: dict[str, set] = {}
-        self._listener_task = None
-
-    async def _ensure_connected(self) -> None:
-        if not self._connected:
-            await self._backend.connect()
-            self._listener_task = __import__("asyncio").create_task(self._listener())
-            self._connected = True
-            logger.debug(f"Redis Cluster 通道已连接: {self._mask_url(self._url)}")
-
-    def _mask_url(self, url: str) -> str:
-        if "@" in url:
-            parts = url.split("@")
-            prefix = parts[0]
-            suffix = parts[1]
-            if "://" in prefix:
-                scheme = prefix.split("://")[0]
-                return f"{scheme}://***@{suffix}"
-        return url
-
-    async def _listener(self) -> None:
-        """监听后端消息，分发到订阅者。"""
-        import asyncio
-        while True:
-            try:
-                event = await self._backend.next_published()
-                channel = event.channel
-                if channel in self._subscribers:
-                    for queue in list(self._subscribers[channel]):
-                        await queue.put(event)
-            except asyncio.CancelledError:
-                break
-            except Exception as e:
-                logger.warning(f"Redis Cluster listener error: {e}")
-
-    async def publish(self, channel: str, message: ChannelMessage) -> None:
-        await self._ensure_connected()
-        message.channel = channel
-        data = {
-            "data": message.data,
-            "event": message.event,
-            "id": message.id,
-            "channel": message.channel,
-            "timestamp": message.timestamp.isoformat(),
-        }
-        await self._backend.publish(channel, json.dumps(data))
-
-    async def subscribe(self, channel: str) -> AsyncIterator[ChannelMessage]:
-        import asyncio
-        await self._ensure_connected()
-        
-        queue: asyncio.Queue = asyncio.Queue()
-        
-        try:
-            # 首个订阅者时订阅 Redis
-            if channel not in self._subscribers:
-                await self._backend.subscribe(channel)
-                self._subscribers[channel] = set()
-            self._subscribers[channel].add(queue)
-            
-            while True:
-                event = await queue.get()
-                try:
-                    data = json.loads(event.message)
-                    yield ChannelMessage(
-                        data=data.get("data"),
-                        event=data.get("event"),
-                        id=data.get("id"),
-                        channel=data.get("channel") or channel,
-                        timestamp=datetime.fromisoformat(data["timestamp"])
-                        if data.get("timestamp")
-                        else datetime.now(),
-                    )
-                except (json.JSONDecodeError, KeyError, TypeError) as e:
-                    logger.warning(f"解析通道消息失败: {e}")
-        finally:
-            if channel in self._subscribers:
-                self._subscribers[channel].discard(queue)
-                if not self._subscribers[channel]:
-                    del self._subscribers[channel]
-                    try:
-                        await self._backend.unsubscribe(channel)
-                    except Exception:
-                        pass
-
-    async def psubscribe(self, pattern: str) -> AsyncIterator[ChannelMessage]:
-        raise NotImplementedError(
-            "Redis Cluster Sharded Pub/Sub 不支持模式订阅。"
-            "请使用具体的 channel 名称。"
-        )
-
-    async def unsubscribe(self, channel: str) -> None:
-        pass  # subscribe() 的 finally 块自动处理
-
-    async def close(self) -> None:
-        if self._connected:
-            if self._listener_task:
-                self._listener_task.cancel()
-            await self._backend.disconnect()
-            self._connected = False
-            self._subscribers.clear()
-            logger.debug("Redis Cluster 通道已关闭")
-
-
-__all__ = ["RedisClusterChannel"]