sycommon-python-lib 0.1.48__py3-none-any.whl → 0.1.49__py3-none-any.whl

sycommon/rabbitmq/rabbitmq_pool.py

@@ -1,5 +1,6 @@
 import asyncio
-from typing import Optional, List, Set, Iterator, Tuple, Dict, Callable
+import random
+from typing import Optional, List, Set, Tuple, Dict, Callable
 from aio_pika import connect_robust, Channel, Message
 from aio_pika.abc import (
     AbstractRobustConnection, AbstractQueue, AbstractExchange, AbstractMessage
@@ -13,7 +14,7 @@ logger = SYLogger
 
 
 class RabbitMQConnectionPool:
-    """单连接RabbitMQ通道池（核心特性：严格单连接+重连释放旧资源+新连接保留自动恢复+全场景加锁）"""
+    """单连接RabbitMQ通道池（核心特性：依赖connect_robust原生自动重连/恢复 + 仅关闭时释放资源 + 全场景加锁）"""
 
     def __init__(
         self,
@@ -45,273 +46,133 @@ class RabbitMQConnectionPool:
         self.prefetch_count = prefetch_count
         self.channel_pool_size = max(1, channel_pool_size)  # 确保池大小不小于1
 
-        # 节点轮询（仅重连时切换）
-        self._host_iterator: Iterator[str] = self._create_host_iterator()
-        self._current_host: Optional[str] = None
-
-        # 核心资源（严格单连接+通道池，仅绑定当前活跃连接）
-        self._connection: Optional[AbstractRobustConnection] = None  # 唯一活跃连接
-        self._free_channels: List[Channel] = []  # 当前连接的空闲通道（带自动恢复）
-        self._used_channels: Set[Channel] = set()  # 当前连接的使用中通道（带自动恢复）
-        self._consumer_channels: Dict[str, Tuple[Channel,
-                                                 AbstractRobustConnection, Callable, bool, dict]] = {}  # 消费者通道跟踪
-
-        # 状态控制（确保并发安全和单连接）
-        self._lock = asyncio.Lock()  # 全局唯一锁，保护所有共享状态
+        # 初始化时随机选择一个主机地址（固定使用，依赖原生重连）
+        self._current_host: str = random.choice(self.hosts)
+        logger.info(
+            f"随机选择RabbitMQ主机: {self._current_host}（依赖connect_robust原生自动重连/恢复）")
+
+        # 核心资源（单连接+通道池，基于原生自动重连）
+        self._connection: Optional[AbstractRobustConnection] = None  # 原生自动重连连接
+        self._free_channels: List[Channel] = []  # 空闲通道（原生自动恢复）
+        self._used_channels: Set[Channel] = set()  # 使用中通道（原生自动恢复）
+        # 消费者通道跟踪
+        self._consumer_channels: Dict[str,
+                                      Tuple[Channel, Callable, bool, dict]] = {}
+
+        # 状态控制（并发安全+生命周期管理）
+        self._lock = asyncio.Lock()
         self._initialized = False
         self._is_shutdown = False
-        self._reconnecting = False  # 避免并发重连
-        self._connection_version = 0  # 连接版本号（区分新旧连接/通道）
-
-    def _create_host_iterator(self) -> Iterator[str]:
-        """创建无限循环的节点轮询迭代器"""
-        while True:
-            for host in self.hosts:
-                yield host
 
     async def _is_connection_valid(self) -> bool:
-        """原子化检查连接有效性（加锁保证无竞态）"""
+        """原子化检查连接有效性（仅判断是否初始化完成且未关闭）"""
         async with self._lock:
             return (
-                self._connection is not None
+                self._initialized
+                and self._connection is not None
                 and not self._connection.is_closed
-                and not self._reconnecting
+                and not self._is_shutdown
             )
 
     @property
     async def is_alive(self) -> bool:
-        """对外暴露的连接存活状态（异步+原子化）"""
+        """对外暴露的连接存活状态"""
         if self._is_shutdown:
             return False
         return await self._is_connection_valid()
 
-    async def _safe_close_old_resources(self):
-        """强制关闭所有旧资源（加锁保证原子性，重连前必调用）"""
-        async with self._lock:
-            logger.info(f"开始释放旧资源（连接版本: {self._connection_version}）...")
-
-            # 1. 关闭所有消费者通道（独立管理，终止旧自动恢复）
-            for queue_name, (channel, _, _, _, _) in self._consumer_channels.items():
-                try:
-                    if not channel.is_closed:
-                        await channel.close()
-                    logger.info(f"已关闭队列 {queue_name} 的旧消费者通道（自动恢复终止）")
-                except Exception as e:
-                    logger.warning(f"关闭消费者通道 {queue_name} 失败: {str(e)}")
-            self._consumer_channels.clear()
-
-            # 2. 关闭所有普通通道（空闲+使用中，终止旧自动恢复）
-            all_channels = self._free_channels + list(self._used_channels)
-            for channel in all_channels:
-                try:
-                    if not channel.is_closed:
-                        await channel.close()
-                except Exception as e:
-                    logger.warning(f"关闭旧通道失败: {str(e)}")
-            self._free_channels.clear()
-            self._used_channels.clear()
-
-            # 3. 强制关闭旧连接（彻底终止旧连接的所有自动恢复）
-            if self._connection:
-                try:
-                    if not self._connection.is_closed:
-                        await self._connection.close()
-                    logger.info(
-                        f"已关闭旧连接: {self._current_host}:{self.port}（版本: {self._connection_version}）")
-                except Exception as e:
-                    logger.warning(f"关闭旧连接失败: {str(e)}")
-                self._connection = None  # 置空，确保单连接
-
-            logger.info("旧资源释放完成（所有旧自动恢复逻辑已终止）")
-
-    async def _create_single_connection(self) -> AbstractRobustConnection:
-        """创建唯一活跃连接（重连前已释放旧资源，确保单连接）"""
-        max_attempts = len(self.hosts) * 2  # 每个节点尝试2次
-        attempts = 0
-        last_error: Optional[Exception] = None
+    async def _create_connection(self) -> AbstractRobustConnection:
+        """创建原生自动重连连接（仅创建一次，内部自动重试）"""
+        if self._is_shutdown:
+            raise RuntimeError("通道池已关闭，无法创建连接")
 
-        while attempts < max_attempts and not self._is_shutdown:
-            self._current_host = next(self._host_iterator)
-            conn_url = f"amqp://{self.username}:{self.password}@{self._current_host}:{self.port}/{self.virtualhost}"
+        conn_url = f"amqp://{self.username}:{self.password}@{self._current_host}:{self.port}/{self.virtualhost}"
+        logger.info(f"尝试创建原生自动重连连接: {self._current_host}:{self.port}")
 
-            try:
-                target_version = self._connection_version + 1
-                logger.info(
-                    f"尝试创建连接: {self._current_host}:{self.port} "
-                    f"（目标版本: {target_version}，{attempts+1}/{max_attempts}）"
-                )
-                # 创建连接（保留aio-pika原生自动恢复）
-                conn = await connect_robust(
-                    conn_url,
-                    properties={
-                        "connection_name": f"{self.app_name}_conn_v{target_version}",
-                        "product": self.app_name
-                    },
-                    heartbeat=self.heartbeat,
-                    timeout=self.connection_timeout,
-                    reconnect_interval=5,  # 单节点内部短间隔重连（原生自动恢复）
-                    max_reconnect_attempts=3,  # 单节点最大重试3次
-                )
-                logger.info(
-                    f"连接创建成功: {self._current_host}:{self.port}（版本: {target_version}）")
-                return conn
-            except Exception as e:
-                attempts += 1
-                last_error = e
-                logger.error(
-                    f"连接节点 {self._current_host}:{self.port} 失败（{attempts}/{max_attempts}）: {str(e)}",
-                    exc_info=True
-                )
-                await asyncio.sleep(min(5 * attempts, self.reconnect_interval))
-
-        raise ConnectionError(
-            f"所有节点创建连接失败（节点列表: {self.hosts}）"
-        ) from last_error
+        try:
+            conn = await connect_robust(
+                conn_url,
+                properties={
+                    "connection_name": f"{self.app_name}_conn",
+                    "product": self.app_name
+                },
+                heartbeat=self.heartbeat,
+                timeout=self.connection_timeout,
+                reconnect_interval=self.reconnect_interval,  # 原生重连间隔
+                max_reconnect_attempts=None,  # 无限重试（按需调整）
+            )
+            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_channel_pool(self):
-        """初始化通道池（加锁保证原子性，绑定当前连接）"""
+        """初始化通道池（通道自带原生自动恢复）"""
         async with self._lock:
             if self._is_shutdown:
                 raise RuntimeError("通道池已关闭，无法初始化")
-
-            # 校验当前连接有效性
             if not self._connection or self._connection.is_closed:
                 raise RuntimeError("无有效连接，无法初始化通道池")
 
+            # 清理无效通道（初始化前确保池为空）
             self._free_channels.clear()
             self._used_channels.clear()
 
-            # 创建指定数量的通道（保留原生自动恢复）
+            # 创建指定数量的通道
             for i in range(self.channel_pool_size):
                 try:
-                    channel = await self._connection.channel()  # 新通道自带自动恢复
+                    channel = await self._connection.channel()  # 通道原生自动恢复
                     await channel.set_qos(prefetch_count=self.prefetch_count)
                     self._free_channels.append(channel)
                 except Exception as e:
-                    logger.error(
-                        f"创建通道失败（第{i+1}个，连接版本: {self._connection_version}）: {str(e)}",
-                        exc_info=True
-                    )
+                    logger.error(f"创建通道失败（第{i+1}个）: {str(e)}", exc_info=True)
                     continue
 
             logger.info(
-                f"通道池初始化完成 - 连接: {self._current_host}:{self.port}（版本: {self._connection_version}）, "
-                f"可用通道数: {len(self._free_channels)}/{self.channel_pool_size}（均带自动恢复）"
+                f"通道池初始化完成 - 可用通道数: {len(self._free_channels)}/{self.channel_pool_size} "
+                f"（均带原生自动恢复）"
             )
 
-    async def _reconnect_if_needed(self) -> bool:
-        """连接失效时重连（加锁保护，严格单连接+释放旧资源）"""
-        # 快速判断，避免无效加锁
-        if self._is_shutdown or self._reconnecting:
-            return False
-
-        self._reconnecting = True
-        try:
-            logger.warning(f"连接失效（当前版本: {self._connection_version}），开始重连...")
-
-            # 1. 强制释放所有旧资源（加锁保证原子性）
-            await self._safe_close_old_resources()
-
-            # 2. 递增连接版本号（加锁保证原子性，区分新旧连接）
-            async with self._lock:
-                self._connection_version += 1
-                target_version = self._connection_version
-
-            # 3. 创建新连接（保留原生自动恢复）
-            new_conn = await self._create_single_connection()
-
-            # 4. 绑定新连接（加锁保证原子性）
-            async with self._lock:
-                self._connection = new_conn
-
-            # 5. 重新初始化通道池（新通道带自动恢复）
-            await self._init_channel_pool()
-
-            # 6. 恢复消费者通道（新通道带自动恢复）
-            await self._restore_consumer_channels()
-
-            logger.info(f"重连成功（新连接版本: {target_version}），所有通道均带自动恢复")
-            async with self._lock:
-                self._initialized = True  # 重连成功后标记为已初始化
-            return True
-        except Exception as e:
-            logger.error(f"重连失败: {str(e)}", exc_info=True)
-            async with self._lock:
-                self._initialized = False
-            return False
-        finally:
-            self._reconnecting = False
-
-    async def _restore_consumer_channels(self):
-        """重连后恢复消费者通道（加锁保证原子性，新通道带自动恢复）"""
-        async with self._lock:
-            if not self._consumer_channels or not self._connection or self._connection.is_closed:
-                return
-            logger.info(
-                f"开始恢复 {len(self._consumer_channels)} 个消费者通道（连接版本: {self._connection_version}）")
-
-            # 临时保存消费者配置（队列名、回调、auto_ack、参数）
-            consumer_configs = list(self._consumer_channels.items())
-            self._consumer_channels.clear()
-
-        # 重新创建消费者（不加锁，避免阻塞其他操作）
-        for queue_name, (_, _, callback, auto_ack, kwargs) in consumer_configs:
-            try:
-                await self.consume_queue(queue_name, callback, auto_ack, **kwargs)
-            except Exception as e:
-                logger.error(
-                    f"恢复消费者队列 {queue_name} 失败: {str(e)}", exc_info=True)
-
     async def _clean_invalid_channels(self):
-        """清理失效通道并补充（加锁保证原子性，仅处理当前连接）"""
+        """清理失效通道并补充（仅处理通道级失效，依赖原生恢复）"""
         async with self._lock:
-            if self._is_shutdown or self._reconnecting:
-                return
-
-            # 1. 校验当前连接有效性
-            current_valid = (
-                self._connection is not None
-                and not self._connection.is_closed
-                and not self._reconnecting
-            )
-            if not current_valid:
-                # 连接失效，触发重连（不加锁，避免死锁）
-                asyncio.create_task(self._reconnect_if_needed())
+            if self._is_shutdown or not self._connection:
                 return
 
-            # 2. 清理空闲通道（仅保留当前连接的有效通道）
+            # 1. 清理空闲通道（保留有效通道）
             valid_free = []
             for chan in self._free_channels:
                 try:
-                    if not chan.is_closed and chan.connection == self._connection:
+                    if not chan.is_closed:
                         valid_free.append(chan)
                     else:
-                        logger.warning(f"清理失效空闲通道（连接版本不匹配或已关闭）")
+                        logger.warning(f"清理失效空闲通道（将自动补充）")
                 except Exception:
                     logger.warning(f"清理异常空闲通道")
             self._free_channels = valid_free
 
-            # 3. 清理使用中通道（仅保留当前连接的有效通道）
+            # 2. 清理使用中通道（保留有效通道）
             valid_used = set()
             for chan in self._used_channels:
                 try:
-                    if not chan.is_closed and chan.connection == self._connection:
+                    if not chan.is_closed:
                         valid_used.add(chan)
                     else:
-                        logger.warning(f"清理失效使用中通道（连接版本不匹配或已关闭）")
+                        logger.warning(f"清理失效使用中通道")
                 except Exception:
                     logger.warning(f"清理异常使用中通道")
             self._used_channels = valid_used
 
-            # 4. 补充通道到指定大小（新通道带自动恢复）
+            # 3. 补充缺失的通道（新通道带原生自动恢复）
             total_valid = len(self._free_channels) + len(self._used_channels)
             missing = self.channel_pool_size - total_valid
             if missing > 0:
-                logger.info(
-                    f"通道池缺少{missing}个通道，补充中（连接版本: {self._connection_version}）...")
+                logger.info(f"通道池缺少{missing}个通道，补充中...")
                 for _ in range(missing):
                     try:
-                        channel = await self._connection.channel()  # 新通道带自动恢复
+                        channel = await self._connection.channel()
                         await channel.set_qos(prefetch_count=self.prefetch_count)
                         self._free_channels.append(channel)
                     except Exception as e:
@@ -319,7 +180,7 @@ class RabbitMQConnectionPool:
                         break
 
     async def init_pools(self):
-        """初始化通道池（加锁保证原子性，仅执行一次）"""
+        """初始化通道池（仅执行一次）"""
         async with self._lock:
             if self._initialized:
                 logger.warning("通道池已初始化，无需重复调用")
@@ -328,88 +189,62 @@ class RabbitMQConnectionPool:
                 raise RuntimeError("通道池已关闭，无法初始化")
 
         try:
-            # 1. 创建新连接（保留原生自动恢复）
-            new_conn = await self._create_single_connection()
+            # 1. 创建原生自动重连连接
+            self._connection = await self._create_connection()
 
-            # 2. 初始化连接版本号和绑定连接（加锁保证原子性）
-            async with self._lock:
-                self._connection_version += 1
-                self._connection = new_conn
-
-            # 3. 初始化通道池（新通道带自动恢复）
+            # 2. 初始化通道池
             await self._init_channel_pool()
 
-            # 4. 标记为已初始化（加锁保证原子性）
+            # 3. 标记为已初始化
             async with self._lock:
                 self._initialized = True
 
-            logger.info("RabbitMQ单连接通道池初始化完成（所有通道均带自动恢复）")
+            logger.info("RabbitMQ通道池初始化完成（原生自动重连/恢复已启用）")
         except Exception as e:
             logger.error(f"初始化失败: {str(e)}", exc_info=True)
-            await self._safe_close_old_resources()
+            await self.close()  # 初始化失败直接关闭
             raise
 
     async def acquire_channel(self) -> Tuple[Channel, AbstractRobustConnection]:
-        """获取通道（加锁保证原子性，返回当前连接+带自动恢复的通道）"""
-        # 快速判断，避免无效加锁
+        """获取通道（返回 (通道, 连接) 元组，保持API兼容）"""
+        # 快速校验状态
         async with self._lock:
             if not self._initialized:
                 raise RuntimeError("通道池未初始化，请先调用init_pools()")
             if self._is_shutdown:
                 raise RuntimeError("通道池已关闭，无法获取通道")
+            if not self._connection or self._connection.is_closed:
+                raise RuntimeError("连接已关闭（等待原生重连）")
 
-        # 先清理失效通道（加锁保证原子性）
+        # 清理失效通道
         await self._clean_invalid_channels()
 
         async with self._lock:
-            # 双重校验连接有效性
-            current_valid = (
-                self._connection is not None
-                and not self._connection.is_closed
-                and not self._reconnecting
-            )
-            if not current_valid:
-                # 连接失效，触发重连（不加锁，避免死锁）
-                reconnect_success = await self._reconnect_if_needed()
-                if not reconnect_success:
-                    raise RuntimeError("连接失效且重连失败，无法获取通道")
-
-            # 优先从空闲池获取（带自动恢复的通道）
+            # 优先从空闲池获取
             if self._free_channels:
                 channel = self._free_channels.pop()
                 self._used_channels.add(channel)
-                return channel, self._connection
+                return channel, self._connection  # 返回 (通道, 连接) 元组
 
-            # 通道池已满，创建临时通道（带自动恢复，用完关闭）
+            # 池满时创建临时通道（用完自动关闭）
             try:
-                channel = await self._connection.channel()  # 临时通道带自动恢复
+                channel = await self._connection.channel()
                 await channel.set_qos(prefetch_count=self.prefetch_count)
                 self._used_channels.add(channel)
                 logger.warning(
-                    f"通道池已达上限（{self.channel_pool_size}），创建临时通道（带自动恢复，用完自动关闭）"
+                    f"通道池已达上限（{self.channel_pool_size}），创建临时通道（用完自动关闭）"
                 )
-                return channel, self._connection
+                return channel, self._connection  # 返回 (通道, 连接) 元组
             except Exception as e:
                 logger.error(f"获取通道失败: {str(e)}", exc_info=True)
                 raise
 
     async def release_channel(self, channel: Channel, conn: AbstractRobustConnection):
-        """释放通道（加锁保证原子性，仅归还当前连接的有效通道）"""
-        # 快速判断，避免无效加锁
+        """释放通道（接收通道和连接参数，保持API兼容）"""
         if not channel or not conn or self._is_shutdown:
             return
 
         async with self._lock:
-            # 仅处理当前连接的通道（旧连接的通道直接关闭）
-            if conn != self._connection:
-                try:
-                    if not channel.is_closed:
-                        await channel.close()
-                    logger.warning(f"已关闭非当前连接的通道（版本不匹配，自动恢复终止）")
-                except Exception as e:
-                    logger.warning(f"关闭非当前连接通道失败: {str(e)}")
-                return
-
             # 通道不在使用中，直接返回
             if channel not in self._used_channels:
                 return
@@ -417,16 +252,13 @@ class RabbitMQConnectionPool:
             # 移除使用中标记
             self._used_channels.remove(channel)
 
-            # 仅归还有效通道（当前连接有效+通道未关闭+池未满）
-            current_valid = (
-                self._connection is not None
-                and not self._connection.is_closed
-                and not self._reconnecting
-            )
-            if current_valid and not channel.is_closed and len(self._free_channels) < self.channel_pool_size:
+            # 仅归还有效通道（通道未关闭+池未满+连接匹配）
+            if (not channel.is_closed
+                and len(self._free_channels) < self.channel_pool_size
+                    and conn == self._connection):  # 确保是当前连接的通道
                 self._free_channels.append(channel)
             else:
-                # 无效通道直接关闭（终止自动恢复）
+                # 无效通道直接关闭（临时通道、池满或连接不匹配时）
                 try:
                     if not channel.is_closed:
                         await channel.close()
@@ -434,7 +266,7 @@ class RabbitMQConnectionPool:
                     logger.warning(f"关闭通道失败: {str(e)}")
 
     async def declare_queue(self, queue_name: str, **kwargs) -> AbstractQueue:
-        """声明队列（使用池内通道，带自动恢复）"""
+        """声明队列（使用池内通道）"""
         channel, conn = await self.acquire_channel()
         try:
             return await channel.declare_queue(queue_name, **kwargs)
@@ -442,7 +274,7 @@ class RabbitMQConnectionPool:
             await self.release_channel(channel, conn)
 
     async def declare_exchange(self, exchange_name: str, exchange_type: str = "direct", **kwargs) -> AbstractExchange:
-        """声明交换机（使用池内通道，带自动恢复）"""
+        """声明交换机（使用池内通道）"""
         channel, conn = await self.acquire_channel()
         try:
             return await channel.declare_exchange(exchange_name, exchange_type, **kwargs)
@@ -450,27 +282,24 @@ class RabbitMQConnectionPool:
             await self.release_channel(channel, conn)
 
     async def publish_message(self, routing_key: str, message_body: bytes, exchange_name: str = "", **kwargs):
-        """发布消息（使用池内通道，带自动恢复）"""
+        """发布消息（依赖原生自动重连/恢复）"""
         channel, conn = 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"消息发布成功 - 连接: {self._current_host}:{self.port}（版本: {self._connection_version}）, "
-                f"交换机: {exchange.name}, 路由键: {routing_key}"
+                f"消息发布成功 - 交换机: {exchange.name}, 路由键: {routing_key}"
             )
         except Exception as e:
             logger.error(f"发布消息失败: {str(e)}", exc_info=True)
-            # 发布失败触发重连（下次使用新通道）
-            asyncio.create_task(self._reconnect_if_needed())
-            raise
+            raise  # 原生会自动重连，无需手动处理
         finally:
             await self.release_channel(channel, conn)
 
     async def consume_queue(self, queue_name: str, callback: Callable[[AbstractMessage], asyncio.Future], auto_ack: bool = False, **kwargs):
-        """消费队列（使用独立通道，带自动恢复，支持多消费者）"""
-        # 快速判断，避免无效加锁
+        """消费队列（独立通道，带原生自动恢复）"""
+        # 快速校验状态
         async with self._lock:
             if not self._initialized:
                 raise RuntimeError("通道池未初始化，请先调用init_pools()")
@@ -480,45 +309,25 @@ class RabbitMQConnectionPool:
         # 先声明队列（确保队列存在）
         await self.declare_queue(queue_name, **kwargs)
 
-        # 获取独立通道（消费者通道不放入普通池）
+        # 获取独立通道（不放入普通池）
         channel, conn = await self.acquire_channel()
 
-        # 注册消费者通道（加锁保证原子性）
+        # 注册消费者通道
         async with self._lock:
             self._consumer_channels[queue_name] = (
-                channel, conn, callback, auto_ack, kwargs)
+                channel, callback, auto_ack, kwargs)
 
         async def consume_callback_wrapper(message: AbstractMessage):
-            """消费回调包装（处理通道失效和自动恢复）"""
+            """消费回调包装（处理通道失效，依赖原生恢复）"""
             try:
-                # 加锁校验通道和连接状态（原子性）
+                # 校验通道和连接状态
                 async with self._lock:
-                    conn_matched = conn == self._connection
                     channel_valid = not channel.is_closed
-                    current_conn_valid = (
-                        self._connection is not None
-                        and not self._connection.is_closed
-                        and not self._reconnecting
-                    )
-
-                # 通道/连接失效，触发重连恢复
-                if not conn_matched or not channel_valid or not current_conn_valid:
-                    logger.warning(
-                        f"消费者通道 {queue_name} 失效（连接版本不匹配/通道关闭），触发重连恢复")
-
-                    # 移除旧消费者记录（加锁保证原子性）
-                    async with self._lock:
-                        if self._consumer_channels.get(queue_name) == (channel, conn, callback, auto_ack, kwargs):
-                            del self._consumer_channels[queue_name]
-
-                    # 释放旧通道（加锁保证原子性）
-                    await self.release_channel(channel, conn)
-
-                    # 重新创建消费者（新通道带自动恢复）
-                    asyncio.create_task(self.consume_queue(
-                        queue_name, callback, auto_ack, **kwargs))
-
-                    # Nack消息（避免丢失）
+                    conn_valid = self._connection and not self._connection.is_closed
+                    conn_matched = conn == self._connection
+
+                if not channel_valid or not conn_valid or not conn_matched:
+                    logger.warning(f"消费者通道 {queue_name} 失效（等待原生自动恢复）")
                     if not auto_ack:
                         await message.nack(requeue=True)
                     return
@@ -531,32 +340,20 @@ class RabbitMQConnectionPool:
                 logger.error(f"消费者通道 {queue_name} 关闭: {str(e)}", exc_info=True)
                 if not auto_ack:
                     await message.nack(requeue=True)
-                asyncio.create_task(self._reconnect_if_needed())
             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)
-                asyncio.create_task(self.consume_queue(
-                    queue_name, callback, auto_ack, **kwargs))
             except Exception as e:
                 logger.error(
                     f"消费消息失败（队列: {queue_name}）: {str(e)}", exc_info=True)
                 if not auto_ack:
                     await message.nack(requeue=True)
 
-        # 日志输出（加锁获取当前连接信息）
-        async with self._lock:
-            current_host = self._current_host
-            current_version = self._connection_version
-
-        logger.info(
-            f"开始消费队列: {queue_name} - 连接: {current_host}:{self.port}（版本: {current_version}）, "
-            f"通道带自动恢复"
-        )
+        logger.info(f"开始消费队列: {queue_name}（通道带原生自动恢复）")
 
         try:
-            # 启动消费（使用带自动恢复的通道）
             await channel.basic_consume(
                 queue_name,
                 consumer_callback=consume_callback_wrapper,
@@ -565,22 +362,56 @@ class RabbitMQConnectionPool:
             )
         except Exception as e:
             logger.error(f"启动消费失败（队列: {queue_name}）: {str(e)}", exc_info=True)
-            # 清理异常的消费者记录和通道（加锁保证原子性）
+            # 清理异常资源
             await self.release_channel(channel, conn)
             async with self._lock:
-                if self._consumer_channels.get(queue_name) == (channel, conn, callback, auto_ack, kwargs):
+                if self._consumer_channels.get(queue_name) == (channel, callback, auto_ack, kwargs):
                     del self._consumer_channels[queue_name]
             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. 关闭所有消费者通道
+        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. 关闭所有普通通道
+        async with self._lock:
+            all_channels = self._free_channels + list(self._used_channels)
+            self._free_channels.clear()
+            self._used_channels.clear()
+        for channel in all_channels:
+            try:
+                if not channel.is_closed:
+                    await channel.close()
+            except Exception as e:
+                logger.warning(f"关闭通道失败: {str(e)}")
+
+        # 3. 关闭连接（终止原生自动重连）
+        if self._connection:
+            try:
+                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单连接通道池...")
-        # 强制释放所有资源（包括自动恢复的通道）
-        await self._safe_close_old_resources()
-        logger.info("RabbitMQ单连接通道池已完全关闭（所有自动恢复逻辑已终止）")
+        logger.info("RabbitMQ通道池已完全关闭")

{sycommon_python_lib-0.1.48.dist-info → sycommon_python_lib-0.1.49.dist-info}/METADATA

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

{sycommon_python_lib-0.1.48.dist-info → sycommon_python_lib-0.1.49.dist-info}/RECORD

@@ -36,7 +36,7 @@ sycommon/models/mqmsg_model.py,sha256=cxn0M5b0utQK6crMYmL-1waeGYHvK3AlGaRy23clqT
 sycommon/models/mqsend_config.py,sha256=NQX9dc8PpuquMG36GCVhJe8omAW1KVXXqr6lSRU6D7I,268
 sycommon/models/sso_user.py,sha256=i1WAN6k5sPcPApQEdtjpWDy7VrzWLpOrOQewGLGoGIw,2702
 sycommon/rabbitmq/rabbitmq_client.py,sha256=dKpiptV892VbW3fErAoRZSE9UVVBZvbVPM3qPu8rQIk,21573
-sycommon/rabbitmq/rabbitmq_pool.py,sha256=VLJ6JIIoVf1_NKV7FNmDFVkX5klN2JtLzbuUaaroEdc,27096
+sycommon/rabbitmq/rabbitmq_pool.py,sha256=q5w1xrBJLh7Z0b_SPDQJsBESjxb06oJj9SfLZglJ6MQ,18225
 sycommon/rabbitmq/rabbitmq_service.py,sha256=UUvGkmDBQ7xTdCLYqkDSYZw5-FUNU7vnmgmANh4Z_bI,39960
 sycommon/sse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/sse/event.py,sha256=k_rBJy23R7crtzQeetT0Q73D8o5-5p-eESGSs_BPOj0,2797
@@ -52,8 +52,8 @@ sycommon/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/tools/docs.py,sha256=OPj2ETheuWjXLyaXtaZPbwmJKfJaYXV5s4XMVAUNrms,1607
 sycommon/tools/snowflake.py,sha256=DdEj3T5r5OEvikp3puxqmmmz6BrggxomoSlnsRFb5dM,1174
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
-sycommon_python_lib-0.1.48.dist-info/METADATA,sha256=VblaProegd-We1N4eJNCKPmBVKiugemWFdpebnx1Jt8,7037
-sycommon_python_lib-0.1.48.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.48.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.48.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.48.dist-info/RECORD,,
+sycommon_python_lib-0.1.49.dist-info/METADATA,sha256=63TO0OnSgCxSzGby7K-c_UQlVXAMf3f8TOeYH63cXDE,7037
+sycommon_python_lib-0.1.49.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.49.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.49.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.49.dist-info/RECORD,,