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

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

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

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

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

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

@@ -245,7 +245,7 @@ class RabbitMQClient:
             logger.info("消息处理器设置成功")
 
     async def start_consuming(self) -> Optional[ConsumerTag]:
-        """启动消息消费（支持自动重连）"""
+        """启动消息消费（支持自动重连 + Header 重试计数限制）"""
         if self._closed:
             raise RuntimeError("客户端已关闭，无法启动消费")
 
@@ -258,10 +258,11 @@ class RabbitMQClient:
             if not self._queue:
                 raise RuntimeError("未配置队列名或队列未创建，无法启动消费")
 
-            # 2. 定义消费回调（包含异常处理和重连逻辑）
+            # 2. 定义消费回调
             async def consume_callback(message: AbstractIncomingMessage):
                 try:
                     # 解析消息体
+                    msg_obj: MQMsgModel
                     if self.auto_parse_json:
                         try:
                             body_dict = json.loads(
@@ -270,19 +271,26 @@ class RabbitMQClient:
                         except json.JSONDecodeError as e:
                             logger.error(
                                 f"JSON消息解析失败: {str(e)}，消息体: {message.body[:100]}...")
-                            await message.nack(requeue=False)  # 解析失败，不重入队
+                            # 解析失败通常无法重试，直接丢弃
+                            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
+                    # 处理成功，手动ACK
                     await message.ack()
                     logger.debug(
                         f"消息处理成功，delivery_tag: {message.delivery_tag}")
@@ -292,19 +300,61 @@ class RabbitMQClient:
                         f"消息处理失败，delivery_tag: {message.delivery_tag}",
                         exc_info=True
                     )
-                    # 处理失败逻辑：首次失败重入队，再次失败丢弃
-                    if message.redelivered:
+
+                    # 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"消息已重入队过，本次拒绝入队: {message.delivery_tag}")
+                            f"消息重试次数已达上限({MAX_RETRY})，丢弃消息。"
+                            f"delivery_tag: {message.delivery_tag}, routing_key: {message.routing_key}"
+                        )
+                        # 丢弃消息（不重新入队）
                         await message.reject(requeue=False)
-                    else:
-                        logger.warning(f"消息重入队: {message.delivery_tag}")
-                        await message.nack(requeue=True)
+                        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 await self.is_connected:
-                        logger.warning("连接已失效，触发客户端重连")
-                        asyncio.create_task(self._safe_reconnect())
+                    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)

{sycommon_python_lib-0.1.56b5 → sycommon_python_lib-0.1.56b6}/src/sycommon/rabbitmq/rabbitmq_pool.py

@@ -118,23 +118,73 @@ class RabbitMQConnectionPool:
             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)}")
+            # 如果连接对象不存在或已关闭，进入重连流程
+            if self._connection is None or self._connection.is_closed:
+                retry_hosts = self.hosts.copy()  # 复制一份列表用于重试
+                last_error = None
+                temp_conn = None  # 临时变量，用于引用本次尝试创建的连接
+
+                # 轮询尝试列表中的每一个 Host
+                while retry_hosts:
+                    host = random.choice(retry_hosts)
+                    retry_hosts.remove(host)  # 从待尝试列表中移除
+
+                    logger.info(f"⚠️ [RECONNECT] 尝试连接节点: {host}")
+                    self._current_host = host
+                    temp_conn = None  # 重置临时引用
+
+                    try:
+                        conn_url = (
+                            f"amqp://{self.username}:{self.password}@{host}:{self.port}/"
+                            f"{self.virtualhost}?name={self.app_name}&heartbeat={self.heartbeat}"
+                            f"&reconnect_interval={self.reconnect_interval}&fail_fast=1"
+                        )
+
+                        # 尝试连接
+                        temp_conn = await connect_robust(conn_url, timeout=self.connection_timeout)
+
+                        # --- 关键点：连接成功 ---
+                        self._connection = temp_conn
+                        temp_conn = None  # 清空临时引用，因为所有权已经移交给 self._connection
+
+                        logger.info(f"🔗 [RECONNECT_OK] 成功连接到节点: {host}")
+                        last_error = None
+                        break  # 成功，跳出循环
+
+                    except Exception as e:
+                        logger.warning(
+                            f"❌ [RECONNECT_FAIL] 节点 {host} 不可用: {str(e)}")
+
+                        # 【核心修复】清理失败的连接对象
+                        if temp_conn is not None:
+                            try:
+                                logger.debug(
+                                    f"🧹 [CLEANUP] 正在关闭失败的连接对象: {id(temp_conn)}")
+                                # 即使连接对象处于异常状态，close() 通常也是安全的
+                                await temp_conn.close()
+                                logger.debug(f"✅ [CLEANUP] 失败连接已关闭")
+                            except Exception as close_err:
+                                logger.warning(
+                                    f"⚠️ [CLEANUP_ERR] 关闭失败连接时出错: {str(close_err)}")
+
+                        last_error = e
+                        asyncio.sleep(self.reconnect_interval)
+                        continue  # 继续试下一个
+
+                # 如果所有节点都试完了还是失败
+                if last_error:
+                    logger.error("💥 [RECONNECT_FATAL] 所有 RabbitMQ 节点均不可用")
+                    raise ConnectionError("所有 RabbitMQ 节点连接失败") from last_error
 
             # 2. 确保主通道存在
             if self._channel is None or self._channel.is_closed:
                 logger.info("⚠️ [RECOVER_CHANNEL] 检测到主通道不存在或已关闭，开始恢复...")
-                self._channel = await self._create_channel_impl(conn)
+                self._channel = await self._create_channel_impl(self._connection)
 
             return self._channel
 

{sycommon_python_lib-0.1.56b5 → sycommon_python_lib-0.1.56b6}/src/sycommon/rabbitmq/rabbitmq_service.py

@@ -1,11 +1,13 @@
 import asyncio
 import json
+import time
 from typing import (
     Callable, Coroutine, Dict, List, Optional, Type, Union, Any
 )
 from pydantic import BaseModel
 from aio_pika.abc import AbstractIncomingMessage, ConsumerTag
 
+from sycommon.config.Config import Config
 from sycommon.models.mqmsg_model import MQMsgModel
 from sycommon.models.mqlistener_config import RabbitMQListenerConfig
 from sycommon.models.mqsend_config import RabbitMQSendConfig
@@ -238,14 +240,16 @@ class RabbitMQService:
 
         app_name = kwargs.get('app_name', cls._config.get(
             "APP_NAME", "")) if cls._config else ""
-        is_sender = not cls._has_listeners
+        # 纯发送器场景（没有监听器），强制不创建队列
+        is_sender_only = not cls._has_listeners and cls._has_senders
 
-        # 根据组件类型决定是否允许创建队列
-        create_if_not_exists = cls._has_listeners  # 只有监听器允许创建队列
+        # 发送器场景下强制禁用队列创建
+        create_if_not_exists = False if is_sender_only else (
+            cls._has_listeners)
 
-        # 为监听器队列名称拼接应用名
         processed_queue_name = queue_name
-        if create_if_not_exists and not is_sender and processed_queue_name and app_name:
+        # 只有非纯发送器场景才处理队列名称拼接
+        if not is_sender_only and create_if_not_exists and processed_queue_name and app_name:
             if not processed_queue_name.endswith(f".{app_name}"):
                 processed_queue_name = f"{processed_queue_name}.{app_name}"
                 logger.info(f"监听器队列名称自动拼接app-name: {processed_queue_name}")
@@ -253,8 +257,9 @@ class RabbitMQService:
                 logger.info(f"监听器队列已包含app-name: {processed_queue_name}")
 
         logger.info(
-            f"创建客户端 - 队列: {processed_queue_name}, 发送器: {is_sender}, "
-            f"允许创建: {create_if_not_exists}"
+            f"创建客户端 - 队列: {processed_queue_name if not is_sender_only else 'N/A'}, "
+            f"纯发送器模式: {is_sender_only}, "
+            f"允许创建队列: {create_if_not_exists}"
         )
 
         # 创建客户端实例（适配精简版RabbitMQClient参数）
@@ -263,9 +268,12 @@ class RabbitMQService:
             exchange_name=cls._config.get(
                 'exchange_name', "system.topic.exchange"),
             exchange_type=kwargs.get('exchange_type', "topic"),
-            queue_name=processed_queue_name,
+            # 纯发送器场景下队列名称设为None，避免队列相关操作
+            queue_name=None if is_sender_only else processed_queue_name,
             routing_key=kwargs.get(
-                'routing_key', f"{processed_queue_name.split('.')[0]}.#" if processed_queue_name else "#"),
+                'routing_key',
+                f"{queue_name.split('.')[0]}.#" if queue_name and not is_sender_only else "#"
+            ),
             durable=kwargs.get('durable', True),
             auto_delete=kwargs.get('auto_delete', False),
             auto_parse_json=kwargs.get('auto_parse_json', True),
@@ -308,33 +316,32 @@ class RabbitMQService:
             # 如果客户端已存在且连接有效，直接返回
             if client_name in cls._clients:
                 client = cls._clients[client_name]
-                is_sender = not cls._has_listeners or (
-                    not kwargs.get('create_if_not_exists', True))
+                is_sender_only = not cls._has_listeners and cls._has_senders
 
                 if await client.is_connected:
-                    # 如果是监听器但队列未初始化，重新连接
-                    if not is_sender and not client._queue:
+                    # 只有非纯发送器场景才检查队列初始化状态
+                    if not is_sender_only and not client._queue and cls._has_listeners:
                         logger.info(f"客户端 '{client_name}' 队列未初始化，重新连接")
                         client.create_if_not_exists = True
                         await client.connect()
                     return client
                 else:
                     logger.info(f"客户端 '{client_name}' 连接已断开，重新连接")
-                    if not is_sender:
-                        client.create_if_not_exists = True
+                    if not is_sender_only:
+                        client.create_if_not_exists = cls._has_listeners
                     await client.connect()
                     return client
 
             # 创建新客户端
             initial_queue_name = kwargs.pop('queue_name', '')
-            is_sender = not cls._has_listeners or (
-                not kwargs.get('create_if_not_exists', True))
+            is_sender_only = not cls._has_listeners and cls._has_senders
 
-            # 发送器特殊处理
-            if is_sender:
+            # 发送器特殊处理 - 纯发送器场景强制不创建队列
+            if is_sender_only:
                 kwargs['create_if_not_exists'] = False
+                # 纯发送器场景下不传递队列名称，避免队列创建
                 client = await cls._create_client(
-                    initial_queue_name,
+                    "",  # 空队列名
                     app_name=cls._config.get("APP_NAME", ""),
                     **kwargs
                 )
@@ -351,8 +358,8 @@ class RabbitMQService:
                 **kwargs
             )
 
-            # 验证队列是否创建成功
-            if not client._queue:
+            # 只有非纯发送器场景才验证队列创建
+            if not is_sender_only and not client._queue:
                 logger.error(f"队列 '{initial_queue_name}' 创建失败，尝试重新创建")
                 client.create_if_not_exists = True
                 await client.connect()
@@ -371,7 +378,7 @@ class RabbitMQService:
 
         cls._has_senders = True
         cls._has_listeners = has_listeners
-        logger.info(f"开始设置 {len(senders)} 个消息发送器")
+        logger.info(f"开始设置 {len(senders)} 个消息发送器，纯发送器模式: {not has_listeners}")
 
         for idx, sender_config in enumerate(senders):
             try:
@@ -394,10 +401,12 @@ class RabbitMQService:
                     logger.info(f"发送客户端 '{normalized_name}' 已存在，跳过")
                     continue
 
-                # 获取或创建客户端
+                # 获取或创建客户端 - 强制禁用队列创建
                 if normalized_name in cls._clients:
                     client = cls._clients[normalized_name]
                     if not await client.is_connected:
+                        # 纯发送器场景下连接时也不创建队列
+                        client.create_if_not_exists = False
                         await client.connect()
                 else:
                     client = await cls.get_client(
@@ -407,7 +416,7 @@ class RabbitMQService:
                         auto_delete=sender_config.auto_delete,
                         auto_parse_json=sender_config.auto_parse_json,
                         queue_name=queue_name,
-                        create_if_not_exists=False,
+                        create_if_not_exists=False,  # 强制不创建队列
                         prefetch_count=prefetch_count,
                         **kwargs
                     )
@@ -419,13 +428,14 @@ class RabbitMQService:
 
                 if normalized_name not in cls._sender_client_names:
                     cls._sender_client_names.append(normalized_name)
-                    logger.info(f"发送客户端 '{normalized_name}' 初始化成功")
+                    logger.info(f"发送客户端 '{normalized_name}' 初始化成功（纯发送器模式）")
 
             except Exception as e:
                 logger.error(
                     f"初始化发送客户端第{idx+1}项失败: {str(e)}", exc_info=True)
 
-        logger.info(f"消息发送器设置完成，共 {len(cls._sender_client_names)} 个发送器")
+        logger.info(
+            f"消息发送器设置完成，共 {len(cls._sender_client_names)} 个发送器，纯发送器模式: {not has_listeners}")
 
     @classmethod
     async def setup_listeners(cls, listeners: List[RabbitMQListenerConfig], has_senders: bool = False, **kwargs) -> None:
@@ -559,8 +569,8 @@ class RabbitMQService:
         handler = cls._message_handlers.get(client_name)
 
         if not handler:
-            logger.warning(f"未找到客户端 '{client_name}' 的处理器，使用默认处理器")
-            handler = cls.default_message_handler
+            logger.warning(f"未找到客户端 '{client_name}' 的处理器")
+            return
 
         # 设置消息处理器
         await client.set_message_handler(handler)
@@ -671,15 +681,6 @@ class RabbitMQService:
         task.add_done_callback(task_done_callback)
         logger.info(f"消费者任务 '{client_name}' 已创建")
 
-    @classmethod
-    async def default_message_handler(cls, parsed_data: MQMsgModel, original_message: AbstractIncomingMessage) -> None:
-        """默认消息处理器"""
-        logger.info(f"\n===== 收到消息 [{original_message.routing_key}] =====")
-        logger.info(f"关联ID: {parsed_data.correlationDataId}")
-        logger.info(f"主题代码: {parsed_data.topicCode}")
-        logger.info(f"消息内容: {parsed_data.msg}")
-        logger.info("===================\n")
-
     @classmethod
     async def get_sender(cls, queue_name: str) -> Optional[RabbitMQClient]:
         """获取发送客户端（适配单通道池）"""
@@ -699,6 +700,8 @@ class RabbitMQService:
             else:
                 logger.info(f"发送器 '{queue_name}' 连接已断开，尝试重连")
                 try:
+                    # 重连时也强制不创建队列
+                    client.create_if_not_exists = False
                     await client.connect()
                     if await client.is_connected:
                         return client
@@ -717,6 +720,8 @@ class RabbitMQService:
                 else:
                     logger.info(f"发送器 '{suffixed_name}' 连接已断开，尝试重连")
                     try:
+                        # 重连时也强制不创建队列
+                        client.create_if_not_exists = False
                         await client.connect()
                         if await client.is_connected:
                             return client
@@ -752,6 +757,8 @@ class RabbitMQService:
 
             while retry_count < max_retry and not cls._is_shutdown:
                 try:
+                    # 重连时强制不创建队列
+                    sender.create_if_not_exists = False
                     await sender.connect()
                     if await sender.is_connected:
                         logger.info(
@@ -792,16 +799,20 @@ class RabbitMQService:
             )
 
             # 构建消息头
+            namespaceId = Config().config.get('Nacos', {}).get('namespaceId', '未知环境')
+            tenant_id = "T000002" if namespaceId == "prod" or namespaceId == "wsuat1" else "T000003"
             mq_header = {
                 "context": SsoUser(
-                    tenant_id="T000002",
+                    tenant_id=tenant_id,
                     customer_id="SYSTEM",
                     user_id="SYSTEM",
                     user_name="SYSTEM",
-                    request_path="",
+                    request_path="/",
                     req_type="SYSTEM",
                     trace_id=logger.get_trace_id(),
-                ).model_dump_json()
+                ).model_dump_json(),
+                "tenant_id": logger.get_trace_id(),
+                "createTime": str(int(time.time() * 1000)),
             }
 
             # 发送消息（单通道场景下依赖原生异步确认）

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

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