sycommon-python-lib 0.1.56b4__tar.gz → 0.1.56b5__tar.gz

{sycommon_python_lib-0.1.56b4 → sycommon_python_lib-0.1.56b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.56b4
+Version: 0.1.56b5
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.1.56b4 → sycommon_python_lib-0.1.56b5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.1.56-beta4"
+version = "0.1.56-beta5"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"

{sycommon_python_lib-0.1.56b4 → sycommon_python_lib-0.1.56b5}/src/sycommon/rabbitmq/rabbitmq_client.py

@@ -145,10 +145,15 @@ class RabbitMQClient:
             raise RuntimeError("客户端已关闭，无法重新连接")
 
         async with self._connect_lock:
-            # 释放旧资源（回调+通道，单通道无需归还，仅清理状态）
-            if self._conn_close_callback and self._channel_conn:
-                self._channel_conn.close_callbacks.discard(
-                    self._conn_close_callback)
+            # 1. 清理旧连接回调（防止内存泄漏）
+            if self._channel_conn and self._conn_close_callback:
+                try:
+                    self._channel_conn.close_callbacks.discard(
+                        self._conn_close_callback)
+                except Exception:
+                    pass
+
+            # 2. 清理状态
             self._channel = None
             self._channel_conn = None
             self._exchange = None
@@ -156,18 +161,14 @@ class RabbitMQClient:
             self._conn_close_callback = None
 
             try:
-                # 从单通道池获取通道+连接（连接池自动确保通道有效）
+                # 3. 获取新通道
                 self._channel, self._channel_conn = await self.connection_pool.acquire_channel()
 
+                # 4. 设置新连接回调（使用 weakref）
                 def on_conn_closed(conn: AbstractRobustConnection, exc: Optional[BaseException]):
-                    """连接关闭回调：触发固定间隔重连"""
-                    logger.warning(
-                        f"客户端连接关闭: {conn!r}，原因: {exc}", exc_info=exc)
-                    self._reconnect_fail_count += 1
-                    # 超过阈值告警
-                    if self._reconnect_fail_count >= self._reconnect_alert_threshold:
-                        logger.error(
-                            f"连接失败次数已达阈值({self._reconnect_alert_threshold})，请检查MQ服务状态")
+                    # 注意：这里需要访问外部的 self，使用闭包或 weakref
+                    # 简单起见，这里用闭包，但务必在 self.close 或 self.connect 时清理回调
+                    logger.warning(f"检测到连接关闭: {exc}")
                     if not self._closed:
                         asyncio.create_task(self._safe_reconnect())
 
@@ -176,20 +177,26 @@ class RabbitMQClient:
                     self._channel_conn.close_callbacks.add(
                         self._conn_close_callback)
 
-                # 重建交换机/队列资源
+                # 5. 重建资源
                 await self._rebuild_resources()
 
-                # 重连成功，重置失败计数器
+                # 重置计数
                 self._reconnect_fail_count = 0
                 logger.info("客户端连接初始化完成")
             except Exception as e:
                 logger.error(f"客户端连接失败: {str(e)}", exc_info=True)
-                # 清理异常状态
-                if self._conn_close_callback and self._channel_conn:
-                    self._channel_conn.close_callbacks.discard(
-                        self._conn_close_callback)
+                # 失败时也要清理可能产生的残留引用
+                if self._channel_conn and self._conn_close_callback:
+                    try:
+                        self._channel_conn.close_callbacks.discard(
+                            self._conn_close_callback)
+                    except Exception:
+                        pass
+                # 清空状态
                 self._channel = None
                 self._channel_conn = None
+                self._conn_close_callback = None
+
                 # 触发重连
                 if not self._closed:
                     asyncio.create_task(self._safe_reconnect())

sycommon_python_lib-0.1.56b5/src/sycommon/rabbitmq/rabbitmq_pool.py

@@ -0,0 +1,320 @@
+import asyncio
+import random
+from typing import Optional, List, Dict, Callable, Tuple
+from aio_pika import connect_robust, RobustChannel, Message
+from aio_pika.abc import (
+    AbstractRobustConnection, AbstractQueue, AbstractExchange, AbstractMessage
+)
+from sycommon.logging.kafka_log import SYLogger
+
+logger = SYLogger
+
+
+class AsyncProperty:
+    """实现 await obj.attr 的支持"""
+
+    def __init__(self, method):
+        self.method = method
+
+    def __get__(self, obj, objtype=None):
+        if obj is None:
+            return self
+        # 关键：当访问 obj.attr 时，直接返回协程对象，而不是方法本身
+        return self.method(obj)
+
+
+class RabbitMQConnectionPool:
+    """单连接单通道RabbitMQ客户端 (增强版日志)"""
+
+    def __init__(
+        self,
+        hosts: List[str],
+        port: int,
+        username: str,
+        password: str,
+        virtualhost: str = "/",
+        heartbeat: int = 30,
+        app_name: str = "",
+        connection_timeout: int = 30,
+        reconnect_interval: int = 5,
+        prefetch_count: int = 2,
+    ):
+        self.hosts = [host.strip() for host in hosts if host.strip()]
+        if not self.hosts:
+            raise ValueError("至少需要提供一个RabbitMQ主机地址")
+
+        self.port = port
+        self.username = username
+        self.password = password
+        self.virtualhost = virtualhost
+        self.app_name = app_name or "rabbitmq-client"
+        self.heartbeat = heartbeat
+        self.connection_timeout = connection_timeout
+        self.reconnect_interval = reconnect_interval
+        self.prefetch_count = prefetch_count
+
+        self._current_host: str = random.choice(self.hosts)
+        logger.info(f"[INIT] 随机选择RabbitMQ主机: {self._current_host}")
+
+        # 核心资源
+        self._connection: Optional[AbstractRobustConnection] = None
+        self._channel: Optional[RobustChannel] = None
+        self._consumer_channels: Dict[str, RobustChannel] = {}
+
+        # 状态控制
+        self._lock = asyncio.Lock()
+        self._initialized = False
+        self._is_shutdown = False
+
+    @AsyncProperty
+    async def is_alive(self) -> bool:
+        """对外暴露的连接存活状态（原子化判断）"""
+        async with self._lock:
+            if self._is_shutdown:
+                return False
+
+            if not self._initialized:
+                return False
+
+            if self._connection is None or self._connection.is_closed:
+                return False
+
+            # 可选：检查主通道是否存活
+            if self._channel is None or self._channel.is_closed:
+                # 如果你认为通道断了连接也算死，就保留这行；否则删除
+                return False
+
+            return True
+
+    async def _create_connection_impl(self) -> AbstractRobustConnection:
+        """
+        连接创建入口
+        """
+        conn_url = (
+            f"amqp://{self.username}:{self.password}@{self._current_host}:{self.port}/"
+            f"{self.virtualhost}?name={self.app_name}&heartbeat={self.heartbeat}"
+            f"&reconnect_interval={self.reconnect_interval}&fail_fast=1"
+        )
+        logger.info(
+            f"🔌 [CONNECT_START] 尝试创建连接 -> {self._current_host}:{self.port}")
+        try:
+            conn = await connect_robust(conn_url, timeout=self.connection_timeout)
+            # 注意：connect_robust 返回时，底层 TCP 可能还在握手，但对象已创建
+            logger.info(f"✅ [CONNECT_OK] 连接对象创建成功: {id(conn)}")
+            return conn
+        except Exception as e:
+            logger.error(f"❌ [CONNECT_FAIL] 连接创建失败: {str(e)}")
+            raise ConnectionError(f"无法连接RabbitMQ {self._current_host}") from e
+
+    async def _create_channel_impl(self, connection: AbstractRobustConnection) -> RobustChannel:
+        """创建通道"""
+        try:
+            channel = await connection.channel()
+            await channel.set_qos(prefetch_count=self.prefetch_count)
+            logger.debug(f"✅ [CHANNEL_OK] 通道创建成功: {id(channel)}")
+            return channel
+        except Exception as e:
+            logger.error(f"❌ [CHANNEL_FAIL] 通道创建失败: {str(e)}")
+            raise
+
+    async def _ensure_main_channel(self) -> RobustChannel:
+        """确保主通道有效 (原子操作)"""
+        async with self._lock:
+            if self._is_shutdown:
+                raise RuntimeError("客户端已关闭")
+
+            # 1. 确保底层连接存在
+            conn = self._connection
+            if conn is None or conn.is_closed:
+                logger.info("⚠️ [RECONNECT] 检测到连接不存在或已关闭，开始重建...")
+                conn = await self._create_connection_impl()
+                self._connection = conn
+                logger.info(f"🔗 [UPDATE] 连接对象已更新: {id(conn)}")
+
+            # 2. 确保主通道存在
+            if self._channel is None or self._channel.is_closed:
+                logger.info("⚠️ [RECOVER_CHANNEL] 检测到主通道不存在或已关闭，开始恢复...")
+                self._channel = await self._create_channel_impl(conn)
+
+            return self._channel
+
+    async def init_pools(self):
+        """
+        初始化入口与异常处理 (修复泄漏的关键)
+        """
+        async with self._lock:
+            if self._is_shutdown:
+                raise RuntimeError("客户端已关闭")
+            if self._initialized:
+                return
+
+        conn_created_in_this_try = None
+        try:
+            # 步骤 A: 创建连接 (在锁外进行，避免阻塞其他操作)
+            conn = await self._create_connection_impl()
+            conn_created_in_this_try = conn  # 记录本次创建的对象，用于失败回滚
+
+            # 步骤 B: 更新状态和初始化通道 (在锁内进行，保证原子性)
+            async with self._lock:
+                if self._is_shutdown:
+                    # 如果在创建连接期间，外部调用了 close，则必须立即清理刚创建的连接
+                    logger.warning("⚠️ [ABORT] 检测到关闭信号，放弃初始化并清理资源")
+                    raise RuntimeError("客户端已关闭")
+
+                self._connection = conn
+                self._channel = await self._create_channel_impl(conn)
+                self._initialized = True
+                logger.info(
+                    f"🚀 [INIT_SUCCESS] 客户端初始化完成. ConnID: {id(self._connection)}")
+
+        except Exception as e:
+            logger.error(f"💥 [INIT_ERROR] 初始化流程异常: {str(e)}", exc_info=True)
+            # 如果步骤A成功但步骤B失败（例如通道创建失败），或者步骤B中出错，
+            # 必须显式关闭在步骤A中创建的连接，否则它会变成“游离连接”。
+            if conn_created_in_this_try:
+                logger.warning(
+                    f"🧹 [LEAK_PREVENTION] 检测到初始化失败，正在显式关闭刚创建的连接: {id(conn_created_in_this_try)}")
+                try:
+                    await conn_created_in_this_try.close()
+                    logger.info(
+                        f"✅ [CLOSE_OK] 泄漏连接已关闭: {id(conn_created_in_this_try)}")
+                except Exception as close_err:
+                    logger.error(f"❌ [CLOSE_ERR] 关闭泄漏连接时出错: {str(close_err)}")
+
+            # 如果是因为中途关闭导致的错误，不需要再次调用全局 close，否则调用
+            if not self._is_shutdown:
+                await self.close()
+            raise
+
+    async def acquire_channel(self) -> Tuple[RobustChannel, AbstractRobustConnection]:
+        """获取主通道"""
+        if not self._initialized and not self._is_shutdown:
+            await self.init_pools()
+        return await self._ensure_main_channel(), self._connection
+
+    async def publish_message(self, routing_key: str, message_body: bytes, exchange_name: str = "", **kwargs):
+        """发布消息"""
+        channel, _ = await self.acquire_channel()
+        try:
+            exchange = channel.default_exchange if not exchange_name else await channel.get_exchange(exchange_name)
+            message = Message(body=message_body, **kwargs)
+            await exchange.publish(message, routing_key=routing_key)
+            logger.debug(f"📤 [PUBLISH] 消息发布成功 - RK: {routing_key}")
+        except Exception as e:
+            logger.error(f"❌ [PUBLISH_FAIL] 发布失败: {str(e)}")
+            raise
+
+    async def consume_queue(self, queue_name: str, callback: Callable[[AbstractMessage], asyncio.Future], auto_ack: bool = False, **kwargs):
+        """消费队列"""
+        if not self._initialized:
+            await self.init_pools()
+
+        async with self._lock:
+            if self._is_shutdown:
+                raise RuntimeError("客户端已关闭")
+            if queue_name in self._consumer_channels:
+                logger.warning(f"⚠️ [CONSUMER_EXISTS] 队列 {queue_name} 已在消费中")
+                return
+            if not self._connection or self._connection.is_closed:
+                raise RuntimeError("连接不可用，无法启动消费")
+
+        await self.declare_queue(queue_name, **kwargs)
+
+        try:
+            # 获取原始连接对象创建新通道
+            conn = self._connection
+            consumer_channel = await conn.channel()
+            await consumer_channel.set_qos(prefetch_count=self.prefetch_count)
+            logger.info(
+                f"✅ [CONSUMER_CHANNEL_OK] 消费者通道创建: {id(consumer_channel)}")
+
+            async with self._lock:
+                if self._is_shutdown:
+                    await consumer_channel.close()
+                    return
+                self._consumer_channels[queue_name] = consumer_channel
+
+            async def consume_callback_wrapper(message: AbstractMessage):
+                try:
+                    await callback(message)
+                    if not auto_ack:
+                        await message.ack()
+                except Exception as e:
+                    logger.error(
+                        f"❌ [CALLBACK_ERR] 消费回调异常 {queue_name}: {str(e)}")
+                    if not auto_ack:
+                        await message.nack(requeue=True)
+
+            await consumer_channel.basic_consume(
+                queue_name, consumer_callback=consume_callback_wrapper, auto_ack=auto_ack, **kwargs
+            )
+            logger.info(f"🎧 [CONSUME_START] 开始消费队列: {queue_name}")
+
+        except Exception as e:
+            logger.error(f"💥 [CONSUME_ERR] 启动消费失败 {queue_name}: {str(e)}")
+            async with self._lock:
+                if queue_name in self._consumer_channels:
+                    del self._consumer_channels[queue_name]
+            raise
+
+    async def close(self):
+        """
+        资源销毁入口
+        """
+        async with self._lock:
+            if self._is_shutdown:
+                return
+            self._is_shutdown = True
+            self._initialized = False
+            # 记录即将关闭的连接ID
+            conn_to_close_id = id(
+                self._connection) if self._connection else None
+
+        logger.info(f"🛑 [CLOSE_START] 开始关闭客户端... (准备关闭连接: {conn_to_close_id})")
+
+        # 1. 关闭消费者通道
+        channels_to_close = []
+        async with self._lock:
+            channels_to_close = list(self._consumer_channels.values())
+            self._consumer_channels.clear()
+
+        for ch in channels_to_close:
+            try:
+                if not ch.is_closed:
+                    await ch.close()
+                    logger.debug(f"✅ [CLOSE_CHANNEL] 消费者通道已关闭")
+            except Exception as e:
+                logger.warning(f"❌ [CLOSE_CHANNEL_ERR] 关闭消费者通道失败: {str(e)}")
+
+        # 2. 关闭主通道
+        if self._channel:
+            try:
+                if not self._channel.is_closed:
+                    await self._channel.close()
+                    logger.info(f"✅ [CLOSE_CHANNEL] 主通道已关闭")
+            except Exception:
+                pass
+            self._channel = None
+
+        # 3. 关闭连接
+        # 确保在 finally 或显式 close 中调用 connection.close()
+        if self._connection:
+            try:
+                # 打印关闭操作
+                logger.info(f"🔌 [CLOSE_CONN] 正在关闭连接: {id(self._connection)}")
+                await self._connection.close()
+                logger.info(f"✅ [CLOSE_OK] 连接已成功关闭: {id(self._connection)}")
+            except Exception as e:
+                logger.warning(f"❌ [CLOSE_ERR] 关闭连接失败: {str(e)}")
+            self._connection = None
+
+        logger.info("🏁 [CLOSE_DONE] RabbitMQ客户端已完全关闭")
+
+    # --- 辅助方法省略 (declare_queue 等) ---
+    async def declare_queue(self, queue_name: str, **kwargs) -> AbstractQueue:
+        channel, _ = await self.acquire_channel()
+        return await channel.declare_queue(queue_name, **kwargs)
+
+    async def declare_exchange(self, exchange_name: str, exchange_type: str = "direct", **kwargs) -> AbstractExchange:
+        channel, _ = await self.acquire_channel()
+        return await channel.declare_exchange(exchange_name, exchange_type, **kwargs)

{sycommon_python_lib-0.1.56b4 → sycommon_python_lib-0.1.56b5}/src/sycommon_python_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.56b4
+Version: 0.1.56b5
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

sycommon_python_lib-0.1.56b4/src/sycommon/rabbitmq/rabbitmq_pool.py

@@ -1,338 +0,0 @@
-import asyncio
-import random
-from typing import Optional, List, Dict, Callable, Tuple
-from aio_pika import connect_robust, RobustChannel, Message
-from aio_pika.abc import (
-    AbstractRobustConnection, AbstractQueue, AbstractExchange, AbstractMessage
-)
-from aio_pika.exceptions import ChannelClosed
-import aiormq.exceptions
-
-from sycommon.logging.kafka_log import SYLogger
-
-logger = SYLogger
-
-
-class RabbitMQConnectionPool:
-    """单连接单通道RabbitMQ客户端（核心特性：依赖connect_robust原生自动重连/恢复 + 仅关闭时释放资源）"""
-
-    def __init__(
-        self,
-        hosts: List[str],
-        port: int,
-        username: str,
-        password: str,
-        virtualhost: str = "/",
-        heartbeat: int = 30,
-        app_name: str = "",
-        connection_timeout: int = 30,
-        reconnect_interval: int = 5,
-        prefetch_count: int = 2,
-    ):
-        # 基础配置校验与初始化
-        self.hosts = [host.strip() for host in hosts if host.strip()]
-        if not self.hosts:
-            raise ValueError("至少需要提供一个RabbitMQ主机地址")
-
-        self.port = port
-        self.username = username
-        self.password = password
-        self.virtualhost = virtualhost
-        self.app_name = app_name or "rabbitmq-client"
-        self.heartbeat = heartbeat
-        self.connection_timeout = connection_timeout
-        self.reconnect_interval = reconnect_interval
-        self.prefetch_count = prefetch_count
-
-        # 初始化时随机选择一个主机地址（固定使用，依赖原生重连）
-        self._current_host: str = random.choice(self.hosts)
-        logger.info(
-            f"随机选择RabbitMQ主机: {self._current_host}（依赖connect_robust原生自动重连/恢复）")
-
-        # 核心资源（单连接+单通道，基于原生自动重连）
-        self._connection: Optional[AbstractRobustConnection] = None  # 原生自动重连连接
-        self._channel: Optional[RobustChannel] = None  # 单通道（原生自动恢复）
-        # 消费者通道跟踪（独立于主通道）
-        self._consumer_channels: Dict[str,
-                                      Tuple[RobustChannel, Callable, bool, dict]] = {}
-
-        # 状态控制（并发安全+生命周期管理）
-        self._lock = asyncio.Lock()
-        self._initialized = False
-        self._is_shutdown = False
-
-    async def _is_connection_valid(self) -> bool:
-        """原子化检查连接有效性（所有状态判断均加锁，确保原子性）"""
-        async with self._lock:
-            # 优先级：先判断是否关闭，再判断是否初始化，最后判断连接状态
-            return not self._is_shutdown and self._initialized and self._connection is not None and not self._connection.is_closed
-
-    @property
-    async def is_alive(self) -> bool:
-        """对外暴露的连接存活状态（原子化判断）"""
-        async with self._lock:
-            if self._is_shutdown:
-                return False
-            # 存活条件：未关闭 + 已初始化 + 连接有效 + 主通道有效
-            return self._initialized and self._connection is not None and not self._connection.is_closed and self._channel is not None and not self._channel.is_closed
-
-    async def _create_connection(self) -> AbstractRobustConnection:
-        """创建原生自动重连连接（仅创建一次，内部自动重试）"""
-        async with self._lock:
-            if self._is_shutdown:
-                raise RuntimeError("客户端已关闭，无法创建连接")
-
-        conn_url = f"amqp://{self.username}:{self.password}@{self._current_host}:{self.port}/{self.virtualhost}?name={self.app_name}&heartbeat={self.heartbeat}&reconnect_interval={self.reconnect_interval}&fail_fast=1"
-        logger.info(f"尝试创建原生自动重连连接: {self._current_host}:{self.port}")
-
-        try:
-            conn = await connect_robust(
-                conn_url,
-                timeout=self.connection_timeout,
-            )
-            logger.info(f"连接创建成功: {self._current_host}:{self.port}（原生自动重连已启用）")
-            return conn
-        except Exception as e:
-            logger.error(f"连接创建失败: {str(e)}", exc_info=True)
-            raise ConnectionError(
-                f"无法连接RabbitMQ主机 {self._current_host}:{self.port}") from e
-
-    async def _init_single_channel(self):
-        """初始化单通道（通道自带原生自动恢复）"""
-        async with self._lock:
-            # 先判断是否关闭（优先级最高）
-            if self._is_shutdown:
-                raise RuntimeError("客户端已关闭，无法初始化通道")
-            # 再判断连接是否有效
-            if not self._connection or self._connection.is_closed:
-                raise RuntimeError("无有效连接，无法初始化通道")
-
-            # 清理旧通道（如果存在）
-            if self._channel and not self._channel.is_closed:
-                await self._channel.close()
-
-            # 创建单通道并设置QOS
-            try:
-                self._channel = await self._connection.channel()
-                await self._channel.set_qos(prefetch_count=self.prefetch_count)
-                logger.info(f"单通道初始化完成（带原生自动恢复）")
-            except Exception as e:
-                logger.error(f"创建单通道失败: {str(e)}", exc_info=True)
-                raise
-
-    async def _check_and_recover_channel(self) -> RobustChannel:
-        """检查并恢复通道（确保通道有效，所有状态判断加锁）"""
-        async with self._lock:
-            # 1. 先判断是否关闭（优先级最高）
-            if self._is_shutdown:
-                raise RuntimeError("客户端已关闭，无法获取通道")
-            # 2. 检查连接状态
-            if not self._connection or self._connection.is_closed:
-                raise RuntimeError("连接已关闭（等待原生重连）")
-            # 3. 通道失效时重新创建
-            if not self._channel or self._channel.is_closed:
-                logger.warning("通道失效，重新创建（依赖原生自动恢复）")
-                await self._init_single_channel()
-
-            return self._channel
-
-    async def init_pools(self):
-        """初始化客户端（仅执行一次）"""
-        async with self._lock:
-            # 原子化判断：是否已关闭/已初始化
-            if self._is_shutdown:
-                raise RuntimeError("客户端已关闭，无法初始化")
-            if self._initialized:
-                logger.warning("客户端已初始化，无需重复调用")
-                return
-
-        try:
-            # 1. 创建原生自动重连连接
-            self._connection = await self._create_connection()
-
-            # 2. 初始化单通道
-            await self._init_single_channel()
-
-            # 3. 标记为已初始化（加锁保护）
-            async with self._lock:
-                self._initialized = True
-
-            logger.info("RabbitMQ单通道客户端初始化完成（原生自动重连/恢复已启用）")
-        except Exception as e:
-            logger.error(f"初始化失败: {str(e)}", exc_info=True)
-            await self.close()  # 初始化失败直接关闭
-            raise
-
-    async def acquire_channel(self) -> Tuple[RobustChannel, AbstractRobustConnection]:
-        """获取单通道（返回 (通道, 连接) 元组，保持API兼容）"""
-        async with self._lock:
-            # 原子化状态校验
-            if self._is_shutdown:
-                raise RuntimeError("客户端已关闭，无法获取通道")
-            if not self._initialized:
-                raise RuntimeError("客户端未初始化，请先调用init_pools()")
-
-        # 检查并恢复通道
-        channel = await self._check_and_recover_channel()
-        return channel, self._connection  # 单通道无需管理"使用中/空闲"状态
-
-    async def declare_queue(self, queue_name: str, **kwargs) -> AbstractQueue:
-        """声明队列（使用单通道）"""
-        channel, _ = await self.acquire_channel()
-        return await channel.declare_queue(queue_name, **kwargs)
-
-    async def declare_exchange(self, exchange_name: str, exchange_type: str = "direct", **kwargs) -> AbstractExchange:
-        """声明交换机（使用单通道）"""
-        channel, _ = await self.acquire_channel()
-        return await channel.declare_exchange(exchange_name, exchange_type, **kwargs)
-
-    async def publish_message(self, routing_key: str, message_body: bytes, exchange_name: str = "", **kwargs):
-        """发布消息（依赖原生自动重连/恢复）"""
-        channel, _ = await self.acquire_channel()
-        try:
-            exchange = channel.default_exchange if not exchange_name else await channel.get_exchange(exchange_name)
-            message = Message(body=message_body, **kwargs)
-            await exchange.publish(message, routing_key=routing_key)
-            logger.debug(
-                f"消息发布成功 - 交换机: {exchange.name}, 路由键: {routing_key}"
-            )
-        except Exception as e:
-            logger.error(f"发布消息失败: {str(e)}", exc_info=True)
-            raise  # 原生会自动重连，无需手动处理
-
-    async def consume_queue(self, queue_name: str, callback: Callable[[AbstractMessage], asyncio.Future], auto_ack: bool = False, **kwargs):
-        """消费队列（独立通道，带原生自动恢复）"""
-        async with self._lock:
-            # 原子化状态校验
-            if self._is_shutdown:
-                raise RuntimeError("客户端已关闭，无法启动消费")
-            if not self._initialized:
-                raise RuntimeError("客户端未初始化，请先调用init_pools()")
-            if queue_name in self._consumer_channels:
-                logger.warning(f"队列 {queue_name} 已在消费中，无需重复启动")
-                return
-
-        # 先声明队列（确保队列存在）
-        await self.declare_queue(queue_name, **kwargs)
-
-        # 创建独立的消费者通道（不使用主单通道，避免消费阻塞发布）
-        async with self._lock:
-            if self._is_shutdown:  # 二次校验：防止创建通道前客户端被关闭
-                raise RuntimeError("客户端已关闭，无法创建消费者通道")
-            if not self._connection or self._connection.is_closed:
-                raise RuntimeError("无有效连接，无法创建消费者通道")
-            channel = await self._connection.channel()
-            await channel.set_qos(prefetch_count=self.prefetch_count)
-
-            # 注册消费者通道
-            self._consumer_channels[queue_name] = (
-                channel, callback, auto_ack, kwargs)
-
-        async def consume_callback_wrapper(message: AbstractMessage):
-            """消费回调包装（处理通道失效，依赖原生恢复）"""
-            try:
-                async with self._lock:
-                    # 原子化校验状态：客户端是否关闭 + 通道是否有效 + 连接是否有效
-                    if self._is_shutdown:
-                        logger.warning(f"客户端已关闭，拒绝处理消息（队列: {queue_name}）")
-                        if not auto_ack:
-                            await message.nack(requeue=True)
-                        return
-                    channel_valid = not channel.is_closed
-                    conn_valid = self._connection and not self._connection.is_closed
-
-                if not channel_valid or not conn_valid:
-                    logger.warning(f"消费者通道 {queue_name} 失效（等待原生自动恢复）")
-                    if not auto_ack:
-                        await message.nack(requeue=True)
-                    return
-
-                # 执行业务回调
-                await callback(message)
-                if not auto_ack:
-                    await message.ack()
-            except ChannelClosed as e:
-                logger.error(f"消费者通道 {queue_name} 关闭: {str(e)}", exc_info=True)
-                if not auto_ack:
-                    await message.nack(requeue=True)
-            except aiormq.exceptions.ChannelInvalidStateError as e:
-                logger.error(
-                    f"消费者通道 {queue_name} 状态异常: {str(e)}", exc_info=True)
-                if not auto_ack:
-                    await message.nack(requeue=True)
-            except Exception as e:
-                logger.error(
-                    f"消费消息失败（队列: {queue_name}）: {str(e)}", exc_info=True)
-                if not auto_ack:
-                    await message.nack(requeue=True)
-
-        logger.info(f"开始消费队列: {queue_name}（通道带原生自动恢复）")
-
-        try:
-            await channel.basic_consume(
-                queue_name,
-                consumer_callback=consume_callback_wrapper,
-                auto_ack=auto_ack,
-                **kwargs
-            )
-        except Exception as e:
-            logger.error(f"启动消费失败（队列: {queue_name}）: {str(e)}", exc_info=True)
-            # 清理异常资源
-            try:
-                async with self._lock:
-                    if not channel.is_closed:
-                        await channel.close()
-                    # 移除无效的消费者通道注册
-                    if queue_name in self._consumer_channels:
-                        del self._consumer_channels[queue_name]
-            except Exception as close_e:
-                logger.warning(f"关闭消费者通道失败: {str(close_e)}")
-            raise
-
-    async def close(self):
-        """关闭客户端（释放所有资源，原子化状态管理）"""
-        async with self._lock:
-            if self._is_shutdown:
-                logger.warning("客户端已关闭，无需重复操作")
-                return
-            # 先标记为关闭，阻止后续所有操作（原子化修改）
-            self._is_shutdown = True
-            self._initialized = False
-
-        logger.info("开始关闭RabbitMQ单通道客户端（释放所有资源）...")
-
-        # 1. 关闭所有消费者通道
-        consumer_channels = []
-        async with self._lock:
-            consumer_channels = list(self._consumer_channels.values())
-            self._consumer_channels.clear()
-        for channel, _, _, _ in consumer_channels:
-            try:
-                if not channel.is_closed:
-                    await channel.close()
-            except Exception as e:
-                logger.warning(f"关闭消费者通道失败: {str(e)}")
-
-        # 2. 关闭主单通道
-        if self._channel:
-            try:
-                async with self._lock:
-                    if not self._channel.is_closed:
-                        await self._channel.close()
-            except Exception as e:
-                logger.warning(f"关闭主通道失败: {str(e)}")
-            self._channel = None
-
-        # 3. 关闭连接（终止原生自动重连）
-        if self._connection:
-            try:
-                async with self._lock:
-                    if not self._connection.is_closed:
-                        await self._connection.close()
-                logger.info(
-                    f"已关闭连接: {self._current_host}:{self.port}（终止原生自动重连）")
-            except Exception as e:
-                logger.warning(f"关闭连接失败: {str(e)}")
-            self._connection = None
-
-        logger.info("RabbitMQ单通道客户端已完全关闭")