mqttxx 2.0.2__py3-none-any.whl → 2.0.3__py3-none-any.whl

mqttxx/client.py

@@ -284,6 +284,7 @@ class MQTTClient:
             else:
                 # 修复 P0-3：RPC 请求无处理器时，立即返回错误响应（防止调用方超时）
                 from .protocol import RPCRequest, RPCResponse
+
                 if isinstance(msg, RPCRequest):
                     logger.warning(
                         f"收到 RPC 请求但无处理器 - topic: {topic_str}, method: {msg.method}"
@@ -291,9 +292,11 @@ class MQTTClient:
                     # 立即发送错误响应
                     error_response = RPCResponse(
                         request_id=msg.request_id,
-                        error=f"No RPC handler registered for topic: {topic_str}"
+                        error=f"No RPC handler registered for topic: {topic_str}",
+                    )
+                    await self.publish(
+                        msg.reply_to, json.dumps(error_response.to_dict()), qos=1
                     )
-                    await self.publish(msg.reply_to, json.dumps(error_response.to_dict()), qos=1)
                 else:
                     logger.debug(f"收到消息（无处理器）- topic: {topic_str}")
 
@@ -381,10 +384,6 @@ class MQTTClient:
 
     async def publish(self, topic: str, payload: str, qos: int = 0):
         """发布消息
-
-        修复点：
-        - ✅ P1-2: 未连接时记录警告
-
         Args:
             topic: 目标主题
             payload: 消息载荷（字符串）
@@ -399,7 +398,6 @@ class MQTTClient:
 
         try:
             await self._client.publish(topic, payload, qos=qos)
-            logger.debug(f"消息已发布 - topic: {topic}, qos: {qos}")
         except aiomqtt.MqttError as e:
             logger.error(f"发布失败 - topic: {topic}, error: {e}")
 

mqttxx/rpc.py

@@ -75,7 +75,7 @@ class RPCManager:
         self,
         client: MQTTClient,
         config: Optional[RPCConfig] = None,
-        auth_callback: Optional[AuthCallback] = None
+        auth_callback: Optional[AuthCallback] = None,
     ):
         """初始化 RPC 管理器
 
@@ -106,7 +106,9 @@ class RPCManager:
         # RPC 状态
         self._pending_calls: dict[str, asyncio.Future] = {}  # request_id → Future
         self._handlers: dict[str, Callable] = {}  # method_name → handler
-        self._pending_calls_lock = asyncio.Lock()  # 修复 P0-1：保护 _pending_calls 并发访问
+        self._pending_calls_lock = (
+            asyncio.Lock()
+        )  # 修复 P0-1：保护 _pending_calls 并发访问
 
         logger.info("RPCManager 已初始化")
 
@@ -129,9 +131,10 @@ class RPCManager:
                 # 同步方法也支持
                 return {"result": "ok"}
         """
+
         def decorator(func: Callable):
             self._handlers[method_name] = func
-            logger.success(f"RPC 方法已注册: {method_name}")
+            # logger.debug(f"RPC 方法已注册: {method_name}")  无需输出
             return func
 
         return decorator
@@ -171,12 +174,12 @@ class RPCManager:
         if isinstance(message, RPCRequest):
             asyncio.create_task(
                 self._handle_request(topic, message),
-                name=f"rpc_req_{message.request_id[:8]}"
+                name=f"rpc_req_{message.request_id[:8]}",
             )
         elif isinstance(message, RPCResponse):
             asyncio.create_task(
                 self._handle_response(topic, message),
-                name=f"rpc_resp_{message.request_id[:8]}"
+                name=f"rpc_resp_{message.request_id[:8]}",
             )
 
     async def call(
@@ -316,8 +319,7 @@ class RPCManager:
                     f"RPC 权限拒绝 - caller: {message.caller_id}, method: {message.method}"
                 )
                 response = RPCResponse(
-                    request_id=message.request_id,
-                    error="Permission denied"
+                    request_id=message.request_id, error="Permission denied"
                 )
                 await self._send_response(message.reply_to, response)
                 return
@@ -328,8 +330,7 @@ class RPCManager:
         if not handler:
             logger.warning(f"方法未找到 - method: {message.method}")
             response = RPCResponse(
-                request_id=message.request_id,
-                error=f"方法未找到: {message.method}"
+                request_id=message.request_id, error=f"方法未找到: {message.method}"
             )
         else:
             # 执行方法
@@ -353,22 +354,20 @@ class RPCManager:
         try:
             if asyncio.iscoroutinefunction(self._auth_callback):
                 allowed = await self._auth_callback(
-                    message.caller_id,
-                    message.method,
-                    message
+                    message.caller_id, message.method, message
                 )
             else:
                 allowed = self._auth_callback(
-                    message.caller_id,
-                    message.method,
-                    message
+                    message.caller_id, message.method, message
                 )
             return bool(allowed)
         except Exception as e:
             logger.exception(f"权限检查失败: {e}")
             return False  # 默认拒绝
 
-    async def _execute_handler(self, handler: Callable, message: RPCRequest) -> RPCResponse:
+    async def _execute_handler(
+        self, handler: Callable, message: RPCRequest
+    ) -> RPCResponse:
         """执行 RPC 方法处理器
 
         Args:
@@ -390,10 +389,7 @@ class RPCManager:
                 result = handler(message.params)
 
             logger.debug(f"RPC 方法执行成功 - method: {message.method}")
-            return RPCResponse(
-                request_id=message.request_id,
-                result=result
-            )
+            return RPCResponse(request_id=message.request_id, result=result)
 
         except asyncio.CancelledError:
             # 任务被取消，向上传播
@@ -401,10 +397,7 @@ class RPCManager:
 
         except Exception as e:
             logger.exception(f"RPC 方法执行失败 - method: {message.method}")
-            return RPCResponse(
-                request_id=message.request_id,
-                error=str(e)
-            )
+            return RPCResponse(request_id=message.request_id, error=str(e))
 
     async def _send_response(self, topic: str, response: RPCResponse):
         """发送 RPC 响应

{mqttxx-2.0.2.dist-info → mqttxx-2.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mqttxx
-Version: 2.0.2
+Version: 2.0.3
 Summary: 基于 aiomqtt 的高级 MQTT 客户端和 RPC 框架
 Author: MQTTX Team
 License: MIT

mqttxx-2.0.3.dist-info/RECORD

@@ -0,0 +1,12 @@
+mqttxx/__init__.py,sha256=9jhV_niQTYU2D4aD4AfVvWAAfbYf4o2vjwbwSMA_Rv4,1722
+mqttxx/client.py,sha256=0wtw8fXW1buqnGbKOrg5sBJDORdSoHb3ErapiK3pkl4,16358
+mqttxx/config.py,sha256=MlhayABPcyHWAQR1kkWT5SNlVPIcJ5j8tBikvt1kMNE,5101
+mqttxx/conventions.py,sha256=d_OwOvLG4cdptZ2wmrsKe055LRVZXMO0pmt-OAgJhvI,4507
+mqttxx/exceptions.py,sha256=EC9NZmvZbfrK9iEdSyoYt4pUl0dp7yVup8mjOfgBaMw,3704
+mqttxx/protocol.py,sha256=mZfGY3naGGT_mDsv9enFPiAgUFjoqA5WbZhaT5xYCBQ,5313
+mqttxx/rpc.py,sha256=diXZg-H_MB6SiXll4Q9voh2ztC21_UAOgMKeLyBBJ4s,13597
+mqttxx-2.0.3.dist-info/LICENSE,sha256=tfwCF8HPjAvvq_veljjH3_YL90X6ttkjTpRl3BGcXTg,1067
+mqttxx-2.0.3.dist-info/METADATA,sha256=DuDs0jX9uoJD6dg_7r4uspORGjKsc_jN1WHRx27zZB8,11545
+mqttxx-2.0.3.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+mqttxx-2.0.3.dist-info/top_level.txt,sha256=4SNRXgOpGCT6ThBzAb8zhUmTyZwnIracAIJWAdXXzw0,7
+mqttxx-2.0.3.dist-info/RECORD,,

mqttxx-2.0.2.dist-info/RECORD

@@ -1,12 +0,0 @@
-mqttxx/__init__.py,sha256=9jhV_niQTYU2D4aD4AfVvWAAfbYf4o2vjwbwSMA_Rv4,1722
-mqttxx/client.py,sha256=mpJS4oTm9V9uqoU4kiRlNK-M8pBVb5mImvxvjyIi57E,16452
-mqttxx/config.py,sha256=MlhayABPcyHWAQR1kkWT5SNlVPIcJ5j8tBikvt1kMNE,5101
-mqttxx/conventions.py,sha256=d_OwOvLG4cdptZ2wmrsKe055LRVZXMO0pmt-OAgJhvI,4507
-mqttxx/exceptions.py,sha256=EC9NZmvZbfrK9iEdSyoYt4pUl0dp7yVup8mjOfgBaMw,3704
-mqttxx/protocol.py,sha256=mZfGY3naGGT_mDsv9enFPiAgUFjoqA5WbZhaT5xYCBQ,5313
-mqttxx/rpc.py,sha256=9klpfn3Qh2keq8Sk312n0psXa3BSI8ThlFXJZ0O1_wU,13749
-mqttxx-2.0.2.dist-info/LICENSE,sha256=tfwCF8HPjAvvq_veljjH3_YL90X6ttkjTpRl3BGcXTg,1067
-mqttxx-2.0.2.dist-info/METADATA,sha256=19jtxWnJVWu0vsr5qL5xQl8akMy_H-oktO-x5pPA-Gs,11545
-mqttxx-2.0.2.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-mqttxx-2.0.2.dist-info/top_level.txt,sha256=4SNRXgOpGCT6ThBzAb8zhUmTyZwnIracAIJWAdXXzw0,7
-mqttxx-2.0.2.dist-info/RECORD,,