sycommon-python-lib 0.1.56b11__py3-none-any.whl → 0.1.56b13__py3-none-any.whl

sycommon/rabbitmq/rabbitmq_client.py

@@ -1,9 +1,7 @@
-from aio_pika import Channel
-from typing import Optional
 import asyncio
 import json
-from typing import Callable, Coroutine, Dict, Any, Union
-from aio_pika import Message, DeliveryMode, ExchangeType
+from typing import Optional, Callable, Coroutine, Dict, Any, Union
+from aio_pika import Channel, Message, DeliveryMode, ExchangeType
 from aio_pika.abc import (
     AbstractExchange,
     AbstractQueue,
@@ -20,13 +18,7 @@ logger = SYLogger
 
 class RabbitMQClient:
     """
-    RabbitMQ 客户端（支持消息发布、消费、自动重连、异常重试）
-    核心特性：
-    1. 基于单通道连接池复用资源，性能优化
-    2. 依赖连接池原生自动重连，客户端仅重建自身资源
-    3. 消息发布支持重试+mandatory机制+超时控制，确保路由有效
-    4. 消费支持手动ACK/NACK
-    5. 兼容JSON/字符串/字典消息格式
+    RabbitMQ 客户端
     """
 
     def __init__(
@@ -42,12 +34,10 @@ class RabbitMQClient:
         create_if_not_exists: bool = True,
         **kwargs,
     ):
-        # 依赖注入：连接池（必须已初始化）
         self.connection_pool = connection_pool
         if not self.connection_pool._initialized:
             raise RuntimeError("连接池未初始化，请先调用 connection_pool.init_pools()")
 
-        # 交换机配置
         self.exchange_name = exchange_name.strip()
         try:
             self.exchange_type = ExchangeType(exchange_type.lower())
@@ -55,17 +45,16 @@ class RabbitMQClient:
             logger.warning(f"无效的exchange_type: {exchange_type}，默认使用'topic'")
             self.exchange_type = ExchangeType.TOPIC
 
-        # 队列配置
         self.queue_name = queue_name.strip() if queue_name else None
         self.routing_key = routing_key.strip() if routing_key else "#"
-        self.durable = durable  # 消息/队列持久化
-        self.auto_delete = auto_delete  # 无消费者时自动删除队列/交换机
-        self.auto_parse_json = auto_parse_json  # 自动解析JSON消息体
-        self.create_if_not_exists = create_if_not_exists  # 不存在则创建交换机/队列
+        self.durable = durable
+        self.auto_delete = auto_delete
+        self.auto_parse_json = auto_parse_json
+        self.create_if_not_exists = create_if_not_exists
 
-        # 内部状态（资源+连接）
+        # 资源状态
         self._channel: Optional[Channel] = None
-        self._channel_conn: Optional[AbstractRobustConnection] = None  # 通道所属连接
+        self._channel_conn: Optional[AbstractRobustConnection] = None
         self._exchange: Optional[AbstractExchange] = None
         self._queue: Optional[AbstractQueue] = None
         self._consumer_tag: Optional[ConsumerTag] = None
@@ -73,45 +62,38 @@ class RabbitMQClient:
             MQMsgModel, AbstractIncomingMessage], Coroutine[Any, Any, None]]] = None
         self._closed = False
 
-        # 线程安全锁
+        # 并发控制
         self._consume_lock = asyncio.Lock()
         self._connect_lock = asyncio.Lock()
-        # 跟踪连接关闭回调（用于后续移除）
+
+        # 防止并发重连覆盖
+        self._connecting = False
+        self._connect_condition = asyncio.Condition()
+
         self._conn_close_callback: Optional[Callable] = None
-        # 控制重连频率的信号量（限制并发重连数）
         self._reconnect_semaphore = asyncio.Semaphore(1)
-        # 固定重连间隔15秒（全局统一）
-        self._RECONNECT_INTERVAL = 15
-        # 跟踪当前重连任务（避免重复创建）
         self._current_reconnect_task: Optional[asyncio.Task] = None
-        # 连接失败计数器（用于告警）
-        self._reconnect_fail_count = 0
-        # 连接失败告警阈值
-        self._reconnect_alert_threshold = 5
+        self._RECONNECT_INTERVAL = 15
 
     @property
     async def is_connected(self) -> bool:
-        """异步检查客户端连接状态（属性，不可调用）"""
         if self._closed:
             return False
         try:
-            # 单通道场景：校验通道+连接+核心资源都有效
             return (
                 self._channel and not self._channel.is_closed
                 and self._channel_conn and not self._channel_conn.is_closed
                 and self._exchange is not None
                 and (not self.queue_name or self._queue is not None)
             )
-        except Exception as e:
-            logger.warning(f"检查连接状态失败: {str(e)}")
+        except Exception:
             return False
 
     async def _rebuild_resources(self) -> None:
-        """重建交换机/队列等资源（依赖已有的通道）"""
         if not self._channel or self._channel.is_closed:
             raise RuntimeError("无有效通道，无法重建资源")
 
-        # 1. 声明交换机
+        # 声明交换机
         self._exchange = await self._channel.declare_exchange(
             name=self.exchange_name,
             type=self.exchange_type,
@@ -119,10 +101,9 @@ class RabbitMQClient:
             auto_delete=self.auto_delete,
             passive=not self.create_if_not_exists,
         )
-        logger.info(
-            f"交换机重建成功: {self.exchange_name}（类型: {self.exchange_type.value}）")
+        logger.info(f"交换机重建成功: {self.exchange_name}")
 
-        # 2. 声明队列（如果配置了队列名）
+        # 声明队列
         if self.queue_name:
             self._queue = await self._channel.declare_queue(
                 name=self.queue_name,
@@ -130,100 +111,134 @@ class RabbitMQClient:
                 auto_delete=self.auto_delete,
                 passive=not self.create_if_not_exists,
             )
-            # 绑定队列到交换机
-            await self._queue.bind(
-                exchange=self._exchange,
-                routing_key=self.routing_key,
-            )
-            logger.info(
-                f"队列重建成功: {self.queue_name} "
-                f"（绑定交换机: {self.exchange_name}, routing_key: {self.routing_key}）"
-            )
+            await self._queue.bind(exchange=self._exchange, routing_key=self.routing_key)
+            logger.info(f"队列重建成功: {self.queue_name}")
 
     async def connect(self) -> None:
         if self._closed:
             raise RuntimeError("客户端已关闭，无法重新连接")
 
+        # 1. 并发控制：使用 _connect_lock 保证只有一个协程在执行连接流程
         async with self._connect_lock:
-            # 1. 清理旧连接回调（防止内存泄漏）
-            if self._channel_conn and self._conn_close_callback:
+            # 如果已经在连了，等待其完成
+            if self._connecting:
+                logger.debug("连接正在进行中，等待现有连接完成...")
                 try:
-                    self._channel_conn.close_callbacks.discard(
-                        self._conn_close_callback)
-                except Exception:
-                    pass
+                    # 等待条件变量，超时设为 60 秒防止死等
+                    await asyncio.wait_for(
+                        self._connect_condition.wait_for(
+                            lambda: not self._connecting),
+                        timeout=60.0
+                    )
+                except asyncio.TimeoutError:
+                    raise RuntimeError("等待连接超时")
 
-            # 2. 清理状态
-            self._channel = None
-            self._channel_conn = None
-            self._exchange = None
-            self._queue = None
-            self._conn_close_callback = None
+                # 等待结束后，再次检查状态
+                if not await self.is_connected:
+                    raise RuntimeError("等待重连后，连接状态依然无效")
+                return
 
-            try:
-                # 3. 获取新通道
-                self._channel, self._channel_conn = await self.connection_pool.acquire_channel()
-
-                # 4. 设置新连接回调（使用 weakref）
-                def on_conn_closed(conn: AbstractRobustConnection, exc: Optional[BaseException]):
-                    # 注意：这里需要访问外部的 self，使用闭包或 weakref
-                    # 简单起见，这里用闭包，但务必在 self.close 或 self.connect 时清理回调
-                    logger.warning(f"检测到连接关闭: {exc}")
-                    if not self._closed:
-                        asyncio.create_task(self._safe_reconnect())
-
-                self._conn_close_callback = on_conn_closed
-                if self._channel_conn:
-                    self._channel_conn.close_callbacks.add(
-                        self._conn_close_callback)
+            # 标记开始连接
+            self._connecting = True
 
-                # 5. 重建资源
-                await self._rebuild_resources()
+        # 释放 _connect_lock，允许其他协程读取状态，但在连接完成前阻止新的连接请求
+        # 注意：这里释放了 _connect_lock，但 self._connecting = True 阻止了新的连接流程
+
+        try:
+            # --- 阶段1: 清理旧资源 ---
+            # 重新获取锁进行资源清理
+            async with self._connect_lock:
+                was_consuming = self._consumer_tag is not None
 
-                # 重置计数
-                self._reconnect_fail_count = 0
-                logger.info("客户端连接初始化完成")
-            except Exception as e:
-                logger.error(f"客户端连接失败: {str(e)}", exc_info=True)
-                # 失败时也要清理可能产生的残留引用
                 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._exchange = None
+                self._queue = None
                 self._conn_close_callback = None
 
-                # 触发重连
-                if not self._closed:
+            # --- 阶段2: 获取新连接 (耗时IO) ---
+            self._channel, self._channel_conn = await self.connection_pool.acquire_channel()
+
+            # 设置回调
+            def on_conn_closed(conn, exc):
+                logger.warning(f"检测到连接关闭: {exc}")
+                if not self._closed and not self._connecting:
                     asyncio.create_task(self._safe_reconnect())
-                raise
+
+            self._conn_close_callback = on_conn_closed
+            if self._channel_conn:
+                self._channel_conn.close_callbacks.add(
+                    self._conn_close_callback)
+
+            # 重建资源
+            await self._rebuild_resources()
+
+            # --- 阶段3: 恢复消费 ---
+            if was_consuming and self._message_handler and self.queue_name:
+                logger.info("🔄 检测到重连前处于消费状态，尝试自动恢复...")
+                try:
+                    self._queue = await self._channel.declare_queue(
+                        name=self.queue_name,
+                        durable=self.durable,
+                        auto_delete=self.auto_delete,
+                        passive=False,
+                    )
+                    await self._queue.bind(exchange=self._exchange, routing_key=self.routing_key)
+                    self._consumer_tag = await self._queue.consume(self._process_message_callback)
+                    logger.info(f"✅ 消费已自动恢复: {self._consumer_tag}")
+                except Exception as e:
+                    logger.error(f"❌ 自动恢复消费失败: {e}")
+                    self._consumer_tag = None
+            else:
+                self._consumer_tag = None
+
+            logger.info("客户端连接初始化完成")
+
+        except Exception as e:
+            logger.error(f"客户端连接失败: {str(e)}", exc_info=True)
+
+            # 异常时清理资源
+            async with self._connect_lock:
+                if self._channel_conn and self._conn_close_callback:
+                    self._channel_conn.close_callbacks.discard(
+                        self._conn_close_callback)
+                self._channel = None
+                self._channel_conn = None
+                self._consumer_tag = None
+
+            raise
+
+        finally:
+            # 【关键修复】必须在持有 Condition 内部锁的情况下调用 notify_all
+            # 这里使用 async with self._connect_condition: 自动完成 acquire() ... notify_all() ... release()
+            async with self._connect_condition:
+                self._connecting = False
+                self._connect_condition.notify_all()
 
     async def _safe_reconnect(self):
-        """安全重连：信号量控制并发+固定15秒间隔"""
+        """安全重连任务（仅用于被动监听连接关闭）"""
         async with self._reconnect_semaphore:
-            # 检查是否已有重连任务在运行
-            if self._current_reconnect_task and not self._current_reconnect_task.done():
-                logger.debug("已有重连任务在运行，跳过重复触发")
+            if self._closed:
                 return
 
-            if self._closed or await self.is_connected:
-                logger.debug("客户端已关闭或已连接，取消重连")
+            # 如果已经在重连，直接忽略
+            if self._connecting:
                 return
 
-            # 固定15秒重连间隔
             logger.info(f"将在{self._RECONNECT_INTERVAL}秒后尝试重连...")
             await asyncio.sleep(self._RECONNECT_INTERVAL)
 
             if self._closed or await self.is_connected:
-                logger.debug("重连等待期间客户端状态变化，取消重连")
                 return
 
             try:
-                logger.info("开始重连RabbitMQ客户端...")
                 self._current_reconnect_task = asyncio.create_task(
                     self.connect())
                 await self._current_reconnect_task
@@ -232,163 +247,112 @@ class RabbitMQClient:
             finally:
                 self._current_reconnect_task = None
 
-    async def set_message_handler(
-        self,
-        handler: Callable[[MQMsgModel, AbstractIncomingMessage], Coroutine[Any, Any, None]],
-    ) -> None:
-        """设置消息处理器（必须是协程函数）"""
+    async def set_message_handler(self, handler: Callable[..., Coroutine]) -> None:
         if not asyncio.iscoroutinefunction(handler):
-            raise TypeError("消息处理器必须是协程函数（使用 async def 定义）")
-
+            raise TypeError("消息处理器必须是协程函数")
         async with self._consume_lock:
             self._message_handler = handler
-            logger.info("消息处理器设置成功")
+
+    async def _process_message_callback(self, message: AbstractIncomingMessage):
+        try:
+            msg_obj: MQMsgModel
+            if self.auto_parse_json:
+                try:
+                    body_dict = json.loads(message.body.decode("utf-8"))
+                    msg_obj = MQMsgModel(**body_dict)
+                except json.JSONDecodeError as e:
+                    logger.error(f"JSON解析失败: {e}")
+                    await message.nack(requeue=False)
+                    return
+            else:
+                msg_obj = MQMsgModel(
+                    body=message.body.decode("utf-8"),
+                    routing_key=message.routing_key,
+                    delivery_tag=message.delivery_tag,
+                    traceId=message.headers.get("trace-id"),
+                    headers=message.headers
+                )
+
+            SYLogger.set_trace_id(msg_obj.traceId)
+
+            if self._message_handler:
+                await self._message_handler(msg_obj, message)
+
+            await message.ack()
+
+        except Exception as e:
+            logger.error(f"消息处理异常: {e}", exc_info=True)
+            headers = dict(message.headers) if message.headers else {}
+            current_retry = int(headers.get("x-retry-count", 0))
+
+            if current_retry >= 3:
+                logger.warning(f"重试次数超限，丢弃消息: {message.delivery_tag}")
+                await message.reject(requeue=False)
+            else:
+                headers["x-retry-count"] = current_retry + 1
+                try:
+                    new_msg = Message(
+                        body=message.body,
+                        headers=headers,
+                        content_type=message.content_type,
+                        delivery_mode=message.delivery_mode
+                    )
+                    # 这里的 publish 如果失败，会触发重连机制
+                    # 但注意，当前是在回调线程中，建议做好异常捕获
+                    await self._exchange.publish(new_msg, routing_key=message.routing_key)
+                    await message.ack()
+                except Exception as pub_err:
+                    logger.error(f"重试发布失败: {pub_err}")
+                    await message.reject(requeue=False)
 
     async def start_consuming(self) -> Optional[ConsumerTag]:
-        """启动消息消费（支持自动重连 + Header 重试计数限制）"""
         if self._closed:
             raise RuntimeError("客户端已关闭，无法启动消费")
 
         async with self._consume_lock:
-            # 1. 校验前置条件
             if not self._message_handler:
-                raise RuntimeError("未设置消息处理器，请先调用 set_message_handler()")
+                raise RuntimeError("未设置消息处理器")
+
             if not await self.is_connected:
                 await self.connect()
-            if not self._queue:
-                raise RuntimeError("未配置队列名或队列未创建，无法启动消费")
-
-            # 2. 定义消费回调
-            async def consume_callback(message: AbstractIncomingMessage):
-                try:
-                    # 解析消息体
-                    msg_obj: MQMsgModel
-                    if self.auto_parse_json:
-                        try:
-                            body_dict = json.loads(
-                                message.body.decode("utf-8"))
-                            msg_obj = MQMsgModel(**body_dict)
-                        except json.JSONDecodeError as e:
-                            logger.error(
-                                f"JSON消息解析失败: {str(e)}，消息体: {message.body[:100]}...")
-                            # 解析失败通常无法重试，直接丢弃
-                            await message.nack(requeue=False)
-                            return
-                    else:
-                        msg_obj = MQMsgModel(
-                            body=message.body.decode("utf-8"),
-                            routing_key=message.routing_key,
-                            delivery_tag=message.delivery_tag,
-                            traceId=message.headers.get("trace-id", None),
-                            headers=message.headers
-                        )
-
-                    # 统一追踪ID
-                    SYLogger.set_trace_id(
-                        message.headers.get("trace-id", None))
-
-                    # 调用消息处理器
-                    await self._message_handler(msg_obj, message)
-
-                    # 处理成功，手动ACK
-                    await message.ack()
-                    logger.debug(
-                        f"消息处理成功，delivery_tag: {message.delivery_tag}")
 
-                except Exception as e:
-                    logger.error(
-                        f"消息处理失败，delivery_tag: {message.delivery_tag}",
-                        exc_info=True
-                    )
-
-                    # 1. 获取当前重试次数，默认为 0
-                    current_retry_count = 0
-                    if message.headers:
-                        current_retry_count = int(
-                            message.headers.get("x-retry-count", 0))
-
-                    # 2. 检查是否超过最大重试次数 (3次)
-                    MAX_RETRY = 3
-                    if current_retry_count >= MAX_RETRY:
-                        logger.warning(
-                            f"消息重试次数已达上限({MAX_RETRY})，丢弃消息。"
-                            f"delivery_tag: {message.delivery_tag}, routing_key: {message.routing_key}"
-                        )
-                        # 丢弃消息（不重新入队）
-                        await message.reject(requeue=False)
-                        return
-
-                    # 3. 次数未满，准备重入队
-                    # 注意：AbstractIncomingMessage.headers 是只读的 (frozendict)，
-                    # 不能直接 message.headers["x-retry-count"] = ...
-                    # 必须重新构造 headers 字典。
-                    new_headers = dict(
-                        message.headers) if message.headers else {}
-                    new_headers["x-retry-count"] = current_retry_count + 1
-
-                    logger.warning(
-                        f"消息处理失败，准备第 {current_retry_count + 1} 次重入队。"
-                        f"delivery_tag: {message.delivery_tag}"
+            if not self._queue:
+                if self.queue_name:
+                    self._queue = await self._channel.declare_queue(
+                        name=self.queue_name,
+                        durable=self.durable,
+                        auto_delete=self.auto_delete,
+                        passive=not self.create_if_not_exists,
                     )
+                    await self._queue.bind(exchange=self._exchange, routing_key=self.routing_key)
+                else:
+                    raise RuntimeError("未配置队列名")
 
-                    try:
-                        new_msg = Message(
-                            body=message.body,
-                            headers=new_headers,
-                            content_type=message.content_type,
-                            delivery_mode=message.delivery_mode
-                        )
-
-                        # 发布到原 Exchange 和 RoutingKey
-                        # 注意：这里可能会抛出异常，如果抛异常，消息可能会丢失（因为已经 Nack 掉了）
-                        await self._exchange.publish(
-                            new_msg,
-                            routing_key=message.routing_key
-                        )
-
-                        # 发布成功后，Ack 掉旧消息
-                        await message.ack()
-                        logger.info(
-                            f"消息已重新发布 (重试次数: {new_headers['x-retry-count']})")
-
-                    except Exception as publish_err:
-                        logger.error(f"重新发布消息失败(消息丢失): {publish_err}")
-                        # 重新发布失败，只能丢弃或者 Nack(False)
-                        await message.reject(requeue=False)
-
-            # 3. 启动消费（单通道消费，避免阻塞发布需确保业务回调非阻塞）
-            self._consumer_tag = await self._queue.consume(consume_callback)
+            self._consumer_tag = await self._queue.consume(self._process_message_callback)
             logger.info(
-                f"开始消费队列: {self._queue.name}，consumer_tag: {self._consumer_tag}"
-            )
+                f"开始消费队列: {self._queue.name}，tag: {self._consumer_tag}")
             return self._consumer_tag
 
     async def stop_consuming(self) -> None:
-        """停止消息消费（适配 RobustChannel）"""
         async with self._consume_lock:
-            try:
-                # 校验核心条件：消费标签、队列、通道均有效
-                if self._consumer_tag and self._queue and self._channel and not self._channel.is_closed:
-                    # 使用队列的 cancel 方法（适配 RobustChannel）
+            if self._consumer_tag and self._queue and self._channel:
+                try:
                     await self._queue.cancel(self._consumer_tag)
-                    logger.info(
-                        f"停止消费成功，consumer_tag: {self._consumer_tag}，队列: {self._queue.name}"
-                    )
-                elif self._consumer_tag:
-                    # 部分资源无效时的日志提示
-                    if not self._queue:
-                        logger.warning(
-                            f"消费标签存在但队列为空，无法取消消费（consumer_tag: {self._consumer_tag}）")
-                    elif not self._channel or self._channel.is_closed:
-                        logger.warning(
-                            f"通道已关闭，消费已自动停止（consumer_tag: {self._consumer_tag}，队列: {self._queue.name if self._queue else '未知'}）"
-                        )
-            except Exception as e:
-                logger.error(
-                    f"停止消费者 '{self._queue.name if self._queue else '未知队列'}' 时出错: {str(e)}", exc_info=True
-                )
-            finally:
-                self._consumer_tag = None  # 无论成败，清理消费标签
+                    logger.info(f"停止消费成功: {self._consumer_tag}")
+                except Exception as e:
+                    logger.warning(f"停止消费异常: {e}")
+            self._consumer_tag = None
+
+    async def _handle_publish_failure(self):
+        try:
+            logger.info("检测到发布异常，强制连接池切换节点...")
+            await self.connection_pool.force_reconnect()
+            # 连接池切换后，必须刷新客户端资源
+            await self.connect()
+            logger.info("故障转移完成，资源已刷新")
+        except Exception as e:
+            logger.error(f"故障转移失败: {e}")
+            raise
 
     async def publish(
         self,
@@ -398,18 +362,9 @@ class RabbitMQClient:
         delivery_mode: DeliveryMode = DeliveryMode.PERSISTENT,
         retry_count: int = 3,
     ) -> None:
-        """
-        发布消息（支持自动重试、mandatory路由校验、5秒超时控制）
-        :param message_body: 消息体（字符串/字典/MQMsgModel）
-        :param headers: 消息头（可选）
-        :param content_type: 内容类型（默认application/json）
-        :param delivery_mode: 投递模式（PERSISTENT=持久化，TRANSIENT=非持久化）
-        :param retry_count: 重试次数（默认3次）
-        """
         if self._closed:
             raise RuntimeError("客户端已关闭，无法发布消息")
 
-        # 处理消息体序列化
         try:
             if isinstance(message_body, MQMsgModel):
                 body = json.dumps(message_body.to_dict(),
@@ -422,93 +377,72 @@ class RabbitMQClient:
             else:
                 raise TypeError(f"不支持的消息体类型: {type(message_body)}")
         except Exception as e:
-            logger.error(f"消息体序列化失败: {str(e)}", exc_info=True)
+            logger.error(f"消息体序列化失败: {e}")
             raise
 
-        # 构建消息对象
-        message = Message(
-            body=body,
-            headers=headers or {},
-            content_type=content_type,
-            delivery_mode=delivery_mode,
-        )
+        message = Message(body=body, headers=headers or {},
+                          content_type=content_type, delivery_mode=delivery_mode)
+        last_exception = None
 
-        # 发布重试逻辑
         for retry in range(retry_count):
             try:
-                # 确保连接有效
                 if not await self.is_connected:
-                    logger.warning(f"发布消息前连接失效，触发重连（retry: {retry}）")
                     await self.connect()
 
-                # 核心：发布消息（mandatory=True 确保路由有效，timeout=5s 避免阻塞）
-                publish_result = await self._exchange.publish(
+                result = await self._exchange.publish(
                     message=message,
                     routing_key=self.routing_key or self.queue_name or "#",
                     mandatory=True,
                     timeout=5.0
                 )
 
-                # 处理 mandatory 未路由场景
-                if publish_result is None:
-                    raise RuntimeError(
-                        f"消息未找到匹配的队列（routing_key: {self.routing_key}），mandatory=True 触发失败"
-                    )
+                if result is None:
+                    raise RuntimeError(f"消息未找到匹配的队列: {self.routing_key}")
 
-                logger.info(
-                    f"消息发布成功（retry: {retry}），routing_key: {self.routing_key}，"
-                    f"delivery_mode: {delivery_mode.value}，mandatory: True，timeout: 5.0s"
-                )
+                logger.info(f"发布成功: {self.routing_key}")
                 return
-            except asyncio.TimeoutError:
-                logger.error(
-                    f"消息发布超时（retry: {retry}/{retry_count-1}），超时时间: 5.0s"
-                )
+
             except RuntimeError as e:
-                logger.error(
-                    f"消息发布业务失败（retry: {retry}/{retry_count-1}）: {str(e)}"
-                )
+                if "未找到匹配的队列" in str(e):
+                    raise
+                last_exception = str(e)
+                await self._handle_publish_failure()
+
             except Exception as e:
-                logger.error(
-                    f"消息发布失败（retry: {retry}/{retry_count-1}）: {str(e)}",
-                    exc_info=True
-                )
-                # 清理失效状态，下次重试重连
-                self._exchange = None
-            # 指数退避重试间隔
-            await asyncio.sleep(0.5 * (2 ** retry))
+                last_exception = str(e)
+                logger.error(f"发布异常: {e}")
+                await self._handle_publish_failure()
 
-        # 所有重试失败
-        raise RuntimeError(
-            f"消息发布失败（已重试{retry_count}次），routing_key: {self.routing_key}，"
-            f"mandatory: True，timeout: 5.0s"
-        )
+            await asyncio.sleep(5)
+
+        raise RuntimeError(f"消息发布最终失败: {last_exception}")
 
     async def close(self) -> None:
-        """关闭客户端（移除回调+释放资源）"""
         self._closed = True
         logger.info("开始关闭RabbitMQ客户端...")
 
-        # 停止重连任务
         if self._current_reconnect_task and not self._current_reconnect_task.done():
             self._current_reconnect_task.cancel()
             try:
                 await self._current_reconnect_task
             except asyncio.CancelledError:
-                logger.debug("重连任务已取消")
+                pass
 
-        # 1. 停止消费
         await self.stop_consuming()
 
-        # 2. 清理回调+状态（单通道无需归还，连接池统一管理）
         async with self._connect_lock:
             if self._conn_close_callback and self._channel_conn:
                 self._channel_conn.close_callbacks.discard(
                     self._conn_close_callback)
+
             self._channel = None
             self._channel_conn = None
             self._exchange = None
             self._queue = None
             self._message_handler = None
 
-        logger.info("RabbitMQ客户端已完全关闭")
+            # 确保唤醒可能正在等待 connect 的任务
+            self._connecting = False
+            self._connect_condition.notify_all()
+
+        logger.info("客户端已关闭")